Merge branch 'develop' into TheOtherBrian1-patch-1

Author: soedirgo

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

@@ -78,6 +78,7 @@ jobs:
         run: |
           packer init amazon-arm64-nix.pkr.hcl
           GIT_SHA=${{github.sha}}
+          # why is postgresql_major defined here instead of where the _three_ other postgresql_* variables are defined?
           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
@@ -143,7 +144,7 @@ jobs:
           aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz
 
       - name: Create release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           name: ${{ steps.process_release_version.outputs.version }}
           tag_name: ${{ steps.process_release_version.outputs.version }}

.github/workflows/build-ccache.yml

@@ -11,11 +11,37 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v3
 
+      - name: Load postgres_release values
+        id: load_postgres_release
+        uses: mikefarah/yq@master
+        with:
+          args: eval '.postgres_release' ansible/vars.yml
+        # The output will be available as steps.load_postgres_release.outputs.stdout
+
       - name: Run checks
-        # Update `ami-release.yaml` too if changing constraints.
         run: |
-          SUFFIX=$(sed -E 's/postgres-version = "[0-9\.]+(.*)"/\1/g' common.vars.pkr.hcl)
-          if [[ -n $SUFFIX ]] ; then
-            echo "We no longer allow merging RC versions to develop."
-            exit 1
-          fi
+          POSTGRES_RELEASES="${{ steps.load_postgres_release.outputs.stdout }}"
+
+          # Iterate through each release
+          for release in $(echo "$POSTGRES_RELEASES" | yq eval 'keys | .[]' -); do
+            VERSION=$(echo "$POSTGRES_RELEASES" | yq eval ".\"$release\"" -)
+            if [[ "$release" == "postgresorioledb-17" ]]; then
+              # Check for suffix after -orioledb
+              if [[ "$VERSION" =~ -orioledb(.*) ]]; then
+                SUFFIX="${BASH_REMATCH[1]}"
+                if [[ -n "$SUFFIX" ]]; then
+                  echo "We no longer allow merging versions with suffixes after -orioledb."
+                  exit 1
+                fi
+              fi
+            else
+              # Check for suffix after version digits
+              if [[ "$VERSION" =~ ([0-9]+\.[0-9]+\.[0-9]+)(.*) ]]; then
+                SUFFIX="${BASH_REMATCH[2]}"
+                if [[ -n "$SUFFIX" ]]; then
+                  echo "We no longer allow merging versions with suffixes after version $VERSION."
+                  exit 1
+                fi
+              fi
+            fi
+          done