refactor workflow, enable release branches for release images and update patch versions for rel-13.x

Author: ihalatci

.github/workflows/build-test-images.yml

@@ -7,46 +7,55 @@ on:
 
   workflow_dispatch:
 
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   prepare_pgversion_matrix:
     runs-on: ubuntu-latest
     steps:
       # Need the repo checked out in order to read the file
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - id: get_versions
-        run: cat circleci/images/PG_VERSIONS >> $GITHUB_OUTPUT
+        shell: bash
+        run: |
+          versions=$(cut -d= -f2 circleci/images/PG_VERSIONS | jq -R -s -c 'split("\n")[:-1]')
+          echo "pgversions=${versions}" >> "$GITHUB_OUTPUT"
     outputs:
-      # Will look like '["13.9", "14.6", "15.1"]'
-      pgversions: ${{ toJSON(steps.get_versions.outputs.*) }}
+      # Will look like '["15.17", "16.13", "17.9", "18.3"]'
+      pgversions: ${{ steps.get_versions.outputs.pgversions }}
 
-  build_dev_images_per_postgres:
-    if: github.ref_name != 'master'
-    name: push-test-images-for-dev
+  build_images_per_postgres:
+    name: push-test-images-per-postgres
     runs-on: ubuntu-latest
     permissions:
       packages: write
     needs:
       - prepare_pgversion_matrix
     env:
-      RELEASE_FLAG: ""
+      RELEASE_FLAG: ${{ (github.ref_name == 'master' || startsWith(github.ref_name, 'release-')) && '1' || '' }}
     strategy:
       fail-fast: false
       matrix:
         command: [extbuilder, exttester, failtester]
         pgversion: ${{ fromJSON(needs.prepare_pgversion_matrix.outputs.pgversions) }}
 
-    steps: &build_images_per_pg_steps
+    steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: 'Login to GitHub Container Registry'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # If current branch is not master,build and publish dev image
+      # Build and publish release/dev image based on RELEASE_FLAG
       - name: Build & Push images
         run: |
           cd circleci/images
@@ -56,31 +65,30 @@ jobs:
             make push-${{ matrix.command }}-${{ matrix.pgversion }}
           fi
 
-  build_dev_images_shared:
-    if: github.ref_name != 'master'
-    name: push-test-images-for-dev
+  build_images_shared:
+    name: push-test-images-shared
     runs-on: ubuntu-latest
     permissions:
       packages: write
     env:
-      RELEASE_FLAG: ""
+      RELEASE_FLAG: ${{ (github.ref_name == 'master' || startsWith(github.ref_name, 'release-')) && '1' || '' }}
     strategy:
       fail-fast: false
       matrix:
         command: [citusupgradetester, pgupgradetester, stylechecker]
 
-    steps: &build_shared_image_steps
+    steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: 'Login to GitHub Container Registry'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # If current branch is not master,build and publish dev image
+      # Build and publish release/dev image based on RELEASE_FLAG
       - name: Build & Push images
         run: |
           cd circleci/images
@@ -89,35 +97,3 @@ jobs:
           else
             make push-${{ matrix.command }}-all
           fi
-
-
-  build_release_images:
-    if: github.ref_name == 'master'
-    needs: prepare_pgversion_matrix
-    name: push-test-images-for-release
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-    env:
-      RELEASE_FLAG: "1"
-    strategy:
-      fail-fast: false
-      matrix:
-        command: [extbuilder, exttester, failtester]
-        pgversion: ${{ fromJSON(needs.prepare_pgversion_matrix.outputs.pgversions) }}
-
-    steps: *build_images_per_pg_steps
-
-  build_release_images_shared:
-    if: github.ref_name == 'master'
-    name: push-shared-images-for-release
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-    env:
-      RELEASE_FLAG: "1"
-    strategy:
-      fail-fast: false
-      matrix:
-        command: [citusupgradetester, pgupgradetester, stylechecker]
-    steps: *build_shared_image_steps

circleci/images/Makefile

@@ -18,13 +18,11 @@ STYLE_CHECKER_TOOLS_VERSION=0.8.18
 
 # Upgrade tests for the PG major versions from PG_VERSIONS file
 CITUS_UPGRADE_PG_VERSIONS=$(shell head PG_VERSIONS|cut -c 6-|tr '\n' ' ')
-CITUS_UPGRADE_VERSIONS_15=v12.1.10
-# 12.1.10 is the latest release of Citus 12 when the test is expanded to cover Citus 12
-CITUS_UPGRADE_VERSIONS_16=v12.1.10
+CITUS_UPGRADE_VERSIONS_15=v12.1.11
+# Latest minor version of Citus 12
+CITUS_UPGRADE_VERSIONS_16=v12.1.11
 # Latest minor version of Citus 13
-CITUS_UPGRADE_VERSIONS_17=v13.2.0
-# Latest minor version of Citus 14
-CITUS_UPGRADE_VERSIONS_18=v14.0.0
+CITUS_UPGRADE_VERSIONS_17=v13.2.1
 
 # Function to get Citus versions for a specific PG major version
 get_citus_versions = $(CITUS_UPGRADE_VERSIONS_$(1))