From 6d4242120de34f9ea26fce0d262620523b60b2b7 Mon Sep 17 00:00:00 2001
From: Tom Winter <tom@aam-digital.com>
Date: Sun, 29 Dec 2024 12:45:58 +0100
Subject: [PATCH] ci: use correct package when publish aam-backend-service

---
 .../aam-backend-service-build-and-publish.yml | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/aam-backend-service-build-and-publish.yml b/.github/workflows/aam-backend-service-build-and-publish.yml
index 336410dd..11d95acb 100644
--- a/.github/workflows/aam-backend-service-build-and-publish.yml
+++ b/.github/workflows/aam-backend-service-build-and-publish.yml
@@ -109,7 +109,7 @@ jobs:
 
       - name: Extract tag (release)
         if: ${{ github.event.ref  != '' }}
-        run: echo "TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+        run: echo "TAG=${GITHUB_REF#refs/tags/aam-backend-service/}" >> $GITHUB_ENV
 
       - name: Extract tag (pull request)
         if: ${{ github.event.ref  == '' }}
@@ -124,6 +124,10 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
+          tags: |
+            type=ref,enable=true,event=pr
+            type=semver,enable=true,pattern={{raw}},priority=600,value=${{ env.TAG }},event=branch
+            type=semver,enable=true,pattern={{raw}},priority=600,value=${{ env.TAG }},event=tag
           images: ${{ env.REGISTRY_IMAGE }}
 
       - name: Set up QEMU
@@ -150,6 +154,7 @@ jobs:
         with:
           platforms: ${{ matrix.platform }}
           context: ./application/aam-backend-service
+          provenance: false
           labels: ${{ steps.meta.outputs.labels }}
           outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
           cache-from: type=gha
@@ -188,10 +193,22 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
+      - name: Extract tag (release)
+        if: ${{ github.event.ref  != '' }}
+        run: echo "TAG=${GITHUB_REF#refs/tags/aam-backend-service/}" >> $GITHUB_ENV
+
+      - name: Extract tag (pull request)
+        if: ${{ github.event.ref  == '' }}
+        run: echo "TAG=pr-${{ github.event.number }}" >> $GITHUB_ENV
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
         with:
+          tags: |
+            type=ref,enable=true,event=pr
+            type=semver,enable=true,pattern={{raw}},priority=600,value=${{ env.TAG }},event=branch
+            type=semver,enable=true,pattern={{raw}},priority=600,value=${{ env.TAG }},event=tag
           images: ${{ env.REGISTRY_IMAGE }}
 
       - name: Login to GitHub Container Registry
@@ -215,8 +232,6 @@ jobs:
       - test
     permissions:
       contents: write # to be able to publish a GitHub release
-      issues: write # to be able to comment on released issues
-      pull-requests: write # to be able to comment on released pull requests
     defaults:
       run:
         working-directory: application/aam-backend-service
@@ -257,7 +272,7 @@ jobs:
       - name: Create Release
         if: env.CURRENT_VERSION != env.NEXT_VERSION
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           TAG_NAME=aam-backend-service/${{ env.NEXT_VERSION }}
           gh api \