fix: adjustments to build scripts

Author: samrose

.github/workflows/ami-release-nix.yml

@@ -82,11 +82,10 @@ jobs:
           packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}"  -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" -var "ansible_arguments=-e postgresql_major=${POSTGRES_MAJOR_VERSION}"  amazon-arm64-nix.pkr.hcl
 
       - name: Build AMI stage 2
-        env:
-          POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }}
         run: |
           packer init stage2-nix-psql.pkr.hcl
           GIT_SHA=${{github.sha}}
+          POSTGRES_MAJOR_VERSION=${{ env.POSTGRES_MAJOR_VERSION }}
           packer build -var "git_sha=${GIT_SHA}" -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${GITHUB_RUN_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" stage2-nix-psql.pkr.hcl
 
       - name: Grab release version

ansible/vars.yml

@@ -11,8 +11,8 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgres15: "15.8.1.003-staging-1"
-  postgres16: "16.3.1.000-staging-1"
+  postgres15: "15.8.1.003-staging-2"
+  postgres16: "16.3.1.000-staging-2"
 
 # Non Postgres Extensions
 pgbouncer_release: "1.19.0"

scripts/nix-provision.sh

@@ -33,11 +33,11 @@ EOF
 
     # Set psql_version and postgresql_version based on POSTGRES_MAJOR_VERSION
     case "${POSTGRES_MAJOR_VERSION}" in
-        15)
+        "15")
             psql_version="psql_15"
             postgresql_version="postgresql15"
             ;;
-        16)
+        "16")
             psql_version="psql_16"
             postgresql_version="postgresql16"
             ;;
@@ -55,7 +55,7 @@ EOF
         --extra-vars "psql_version=${psql_version}" \
         --extra-vars "postgresql_version=${postgresql_version}" \
         --extra-vars "nix_secret_key=${NIX_SECRET_KEY}" \
-        --extra-vars "postgres_major_version=${POSTGRES_MAJOR_VERSION}" \
+        --extra-vars "postgresql_major_version=${POSTGRES_MAJOR_VERSION}" \
         $ARGS
 }