chore: use json file instead of environment or repo variables

Signed-off-by: Jonathan Gonzalez V. <[email protected]>

Author: sxd

.env

@@ -11,11 +11,14 @@ on:
         description: "ID of the Patch"
         required: false
         default: ""
+      major_version:
+        description: "PostgreSQL major version to build against to"
+        required: false
+        default: ""
 
 # set up environment variables to be used across all the jobs
 env:
   REGISTRY: "ghcr.io/${{ github.repository_owner }}/postgresql-trunk"
-  TAG: "${{ vars.PG_MAJOR }}-commitfest-master"
   BRANCH: "master"
 
 defaults:
@@ -32,20 +35,24 @@ jobs:
       packages: write
     outputs:
       tag: ${{ env.TAG }}
-    steps:
-    - name: Set common environment variables
-      uses: c-py/action-dotenv-to-setenv@v5
-      with:
-        env-file: .env
 
+    steps:
     - name: Checkout Code
       uses: actions/checkout@v4
 
+    - name: Set PostgreSQL Major version
+      run: |
+        majorVersion="${{ github.event.inputs.major_version }}"
+        if [[ -z "${majorVersion}" ]]; then
+          majorVersion=`cat pg_major.json | jq  -r '.pg_major'`
+        fi
+        echo "PG_MAJOR=${majorVersion}" >> $GITHUB_ENV
+
     - name: Set commitfest branch and tag
       if: github.event.inputs.commitfest_id != '' && github.event.inputs.patch_id != ''
       run: |
         BRANCH="commitfest/${{ github.event.inputs.commitfest_id }}/${{ github.event.inputs.patch_id }}"
-        TAG="${{ vars.PG_MAJOR }}-${BRANCH////-}"
+        TAG="${{ env.PG_MAJOR }}-${BRANCH////-}"
         echo "TAG=${TAG}" >> $GITHUB_ENV
         echo "BRANCH=${BRANCH}" >> $GITHUB_ENV
 

.github/workflows/build-commitfest.yml

@@ -15,7 +15,6 @@ env:
   KIND_VERSION: "v0.23.0"
   K8S_VERSION: "v1.30.2"
   REGISTRY: "ghcr.io/${{ github.repository_owner }}/postgresql-trunk"
-  TAG: "${{ vars.PG_MAJOR }}-devel"
 
 defaults:
   run:
@@ -33,6 +32,18 @@ jobs:
       POSTGRES_IMG: ${{ steps.set-env.outputs.POSTGRES_IMG }}
       E2E_PRE_ROLLING_UPDATE_IMG: ${{ steps.set-env.outputs.E2E_PRE_ROLLING_UPDATE_IMG }}
     steps:
+    - name: Checkout Code
+      uses: actions/checkout@v4
+
+    - name: Set PostgreSQL Major version
+      run: |
+        majorVersion="${{ github.event.inputs.major_version }}"
+        if [[ -z "${majorVersion}" ]]; then
+          majorVersion=`cat pg_major.json | jq  -r '.pg_major'`
+        fi
+        echo "PG_MAJOR=${majorVersion}" >> $GITHUB_ENV
+        echo "TAG=${majorVersion}-devel" >> $GITHUB_ENV
+
     - name: Set Global Env Vars
       id: set-env
       run: |
@@ -43,9 +54,6 @@ jobs:
         echo "POSTGRES_IMG=${postgres_img}" >> $GITHUB_OUTPUT
         echo "E2E_PRE_ROLLING_UPDATE_IMG=${e2e_pre_rolling_update_image}" >> $GITHUB_OUTPUT
 
-    - name: Checkout Code
-      uses: actions/checkout@v4
-
     - name: Log in to the GitHub Container registry
       uses: docker/login-action@v3
       with:
@@ -160,9 +168,9 @@ jobs:
         if: (always() && !cancelled())
         env:
           RUNNER: "local"
-          POSTGRES_VERSION: "${{ vars.PG_MAJOR }}"
+          POSTGRES_VERSION: "${{ env.PG_MAJOR }}"
           RUN_ID: "${{ github.run_id }}"
-          MATRIX: "${{ env.ID }}-${{ env.POSTGRES_KIND }}-${{ vars.PG_MAJOR }}"
+          MATRIX: "${{ env.ID }}-${{ env.POSTGRES_KIND }}-${{ env.PG_MAJOR }}"
           REPOSITORY: "${{ github.repository }}"
           BRANCH_NAME: "${GITHUB_REF#refs/heads/}"
           GIT_REF: "${{ github.ref_name }}"

.github/workflows/continuous-delivery.yml

@@ -0,0 +1,3 @@
+{
+  "pg_major": 17
+}