make sure final-builder-version works

ajslater · Jan 25, 2022 · 52000b7 · 52000b7
1 parent b6fdd7b
commit 52000b7
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/alpha-deploy.sh b/alpha-deploy.sh
@@ -11,6 +11,7 @@ catch() {
     poetry run pushover -s1 "$PKG_VERSION failed"
 }
 trap 'catch' ERR
+export PKG_VERSION
 ./docker-build-codex-base.sh
 ./docker-build-codex-builder-base.sh
 ./alpha-test-build-dist.sh

diff --git a/docker-build-codex-base.sh b/docker-build-codex-base.sh
@@ -29,6 +29,7 @@ CODEX_DIST_BUILDER_VERSION=$(./docker-version-codex-dist-builder.sh)
 export CODEX_DIST_BUILDER_VERSION
 CODEX_BUILDER_FINAL_VERSION=$(./docker-version-codex-builder-final.sh)
 export CODEX_BUILDER_FINAL_VERSION
+export PKG_VERSION
 if [ -n "${PLATFORMS:-}" ]; then
     PLATFORM_ARG=(--set "*.platform=$PLATFORMS")
 else

diff --git a/docker-build-codex-builder-base.sh b/docker-build-codex-builder-base.sh
@@ -31,6 +31,7 @@ export CODEX_BASE_VERSION
 export CODEX_BUILDER_BASE_VERSION
 export CODEX_DIST_BUILDER_VERSION
 export CODEX_BUILDER_FINAL_VERSION
+export PKG_VERSION
 ARCH=$(uname -m)
 HOST_CACHE_DIR="./cache/packages/$ARCH"
 mkdir -p "$HOST_CACHE_DIR/pypoetry" "$HOST_CACHE_DIR/pip"

diff --git a/docker-build-codex-dist-builder.sh b/docker-build-codex-dist-builder.sh
@@ -23,6 +23,7 @@ CODEX_BUILDER_FINAL_VERSION=$(./docker-version-codex-builder-final.sh)
 export CODEX_BUILDER_BASE_VERSION
 export CODEX_DIST_BUILDER_VERSION
 export CODEX_BUILDER_FINAL_VERSION
+export PKG_VERSION
 if [[ -z ${CIRCLECI:-} && -z ${PLATFORMS:-} ]]; then
     # shellcheck disable=SC1091
     source .env.platforms

diff --git a/docker-version-codex-builder-final.sh b/docker-version-codex-builder-final.sh
@@ -5,12 +5,11 @@ CODEX_BUILDER_BASE_VERSION=$(./docker-version-codex-builder-base.sh)
 # shellcheck disable=SC2046
 DEPS=(
     "$0"
-    "dist/$CODEX_WHEEL"
     builder-final.Dockerfile
     docker-build-codex-builder-final.sh
 )
 DEPS_MD5S=$(md5sum "${DEPS[@]}")
-VERSION=$(echo -e "$CODEX_BUILDER_BASE_VERSION  codex-builder-base-version\n$DEPS_MD5S" |
+VERSION=$(echo -e "$CODEX_BUILDER_BASE_VERSION  codex-builder-base-version\n$PKG_VERSION  codex-package-version$DEPS_MD5S" |
     LC_ALL=C sort |
     md5sum |
     awk '{print $1}')