Merge pull request #14 from hartmut-co-uk/github-actions-2

chore: cicd - clearer docker image tag names for master/prs

Author: hartmut-co-uk

.github/workflows/main.yml

@@ -60,7 +60,7 @@ jobs:
   build-and-push:
     runs-on: ubuntu-latest
     needs: test
-    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')
+    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') || github.event_name == 'pull_request'
 
     steps:
       - name: Checkout code
@@ -82,10 +82,16 @@ jobs:
             # For tags, use the tag name
             TAG=${GITHUB_REF#refs/tags/}
             echo "tags=hartmutcouk/pg-repack-docker:$TAG,hartmutcouk/pg-repack-docker:latest" >> $GITHUB_OUTPUT
+          elif [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            # For PRs, use PR number and short hash
+            BRANCH_NAME="pr-${{ github.event.number }}"
+            SHORT_HASH=$(echo ${{ github.sha }} | cut -c1-7)
+            echo "tags=hartmutcouk/pg-repack-docker:${BRANCH_NAME}.${SHORT_HASH}" >> $GITHUB_OUTPUT
           else
-            # For master/main branch, use snapshot with date
-            DATE=$(date +%Y%m%d)
-            echo "tags=hartmutcouk/pg-repack-docker:snapshot-$DATE" >> $GITHUB_OUTPUT
+            # For master/main branch commits, normalize branch name and use short hash
+            BRANCH_NAME=$(echo "${GITHUB_REF#refs/heads/}" | sed 's/[^a-zA-Z0-9]/-/g' | tr '[:upper:]' '[:lower:]')
+            SHORT_HASH=$(echo ${{ github.sha }} | cut -c1-7)
+            echo "tags=hartmutcouk/pg-repack-docker:${BRANCH_NAME}.${SHORT_HASH}" >> $GITHUB_OUTPUT
           fi
 
       - name: Build and push multi-platform image