fix: tags should comply with cnpg requirements

Signed-off-by: Niccolò Fei <[email protected]>

Author: NiccoloFei

.github/workflows/build-commitfest.yml

@@ -15,7 +15,7 @@ on:
 # set up environment variables to be used across all the jobs
 env:
   REGISTRY: "ghcr.io/${{ github.repository_owner }}/postgresql-trunk"
-  TAG: "commitfest-master"
+  TAG: "${{ vars.PG_MAJOR }}-commitfest-master"
   BRANCH: "master"
 
 defaults:
@@ -38,7 +38,7 @@ jobs:
       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=${BRANCH////-}
+        TAG="${{ vars.PG_MAJOR }}-${BRANCH////-}"
         echo "TAG=${TAG}" >> $GITHUB_ENV
         echo "BRANCH=${BRANCH}" >> $GITHUB_ENV
 

.github/workflows/build.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       extra_tag:
-        description: "Image will be tagged as `dev-<gh_run_id>` (e.g dev-1234). With this field you can set an extra tag"
+        description: "Use this field to set an extra tag (make sure it starts with the PG major)"
         required: false
         default: ""
       pg_repo:
@@ -19,7 +19,7 @@ on:
 # set up environment variables to be used across all the jobs
 env:
   REGISTRY: "ghcr.io/${{ github.repository_owner }}/postgresql-trunk"
-  TAG: "dev-${{ github.run_number }}"
+  TAG: "${{ vars.PG_MAJOR }}-${{ github.run_number }}"
 
 defaults:
   run: