From 62eaee67f99a9a0304d6ad79d644a401f65b5cbd Mon Sep 17 00:00:00 2001 From: Gabe Goodhart Date: Tue, 30 Jan 2024 10:54:39 -0700 Subject: [PATCH 1/2] FixWheelReleaseWithBuildx: Better logic in release test Signed-off-by: Gabe Goodhart --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c901a25..407efc4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,7 +49,8 @@ ARG RELEASE_DRY_RUN COPY ./test /src/test COPY ./ci/run-tests.sh /src/ci/run-tests.sh RUN true && \ - ([ "$RELEASE_DRY_RUN" != "true" ] && sleep 90 || true) && \ + ([ "$RELEASE_DRY_RUN" != "true" ] && sleep 30 || true) && \ + pip cache purge && \ pip install alchemy-config==${RELEASE_VERSION} && \ ./ci/run-tests.sh && \ true From d81aba2e145f07ae4de17043dfaa285285345f9d Mon Sep 17 00:00:00 2001 From: Gabe Goodhart Date: Tue, 30 Jan 2024 10:54:59 -0700 Subject: [PATCH 2/2] FixWheelReleaseWithBuildx: Build release without buildkit The whole point of the release build is to sequentially do the release then verify that it can be installed. With buildkit, these stages don't happen in a linear order. Signed-off-by: Gabe Goodhart --- ci/release.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/release.sh b/ci/release.sh index 7b6e260..1cb5ec6 100755 --- a/ci/release.sh +++ b/ci/release.sh @@ -6,6 +6,11 @@ cd $(dirname ${BASH_SOURCE[0]})/.. # Get the tag for this release tag=$(echo $REF | cut -d'/' -f3-) +# We explicitly don't want to run with buildkit so that the docker builds happen +# in a linear fashion since our `release_test` stages intentionally don't +# inherit from the stages where the publication happens. +export DOCKER_BUILDKIT=0 + # Build the docker phase that will release and then test it docker build . \ --target=release_test \