perf: separate delete branch logic

Author: andhreljaKern

.github/workflows/az_acr_delete.yml

@@ -2,14 +2,9 @@ name: 'ACR: Delete Docker Image'
 
 on:
   workflow_call:
-    inputs:
-      image_tag:
-        description: 'Image Tag'
-        required: true
-        type: string
 
 jobs:
-  az-acr-delete:
+  az-acr-delete-test:
     name: "ACR: Delete Test Image"
     runs-on: ubuntu-latest
     environment: dev
@@ -27,13 +22,46 @@ jobs:
 
       - name: Configure branch name
         id: branch_name
-        run: echo "GH_REF_NAME=$(echo ${{ inputs.image_tag }} | sed 's|/|-|g')" >> $GITHUB_OUTPUT
+        run: echo "GH_REF_NAME=$(echo "test-${{ github.event.ref }}" | sed 's|/|-|g')" >> $GITHUB_OUTPUT
 
-      - name: Delete Test Container Image
+      - name: Delete Container Image
         uses: azure/cli@v2
         with:
           inlineScript: |
             az acr repository delete \
               --name ${{ env.AZURE_CONTAINER_REGISTRY }} \
               --image ${{ github.event.repository.name }}:${{ steps.branch_name.outputs.GH_REF_NAME }} \
-              --yes || true
+              --yes || true
+
+  az-acr-delete-matrix:
+    name: 'ACR: Delete Branch Images'
+    runs-on: ubuntu-latest
+    environment: dev
+    env:
+      AZURE_CONTAINER_REGISTRY: ${{ vars.AZURE_CONTAINER_REGISTRY }}
+      ACR_LOGIN_USERNAME: ${{ secrets.ACR_LOGIN_USERNAME }}
+      ACR_LOGIN_PASSWORD: ${{ secrets.ACR_LOGIN_PASSWORD }}
+    strategy:
+      matrix:
+        platform: [amd64, arm64]
+    steps:
+      - name: Azure Cloud Login
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+      
+      - name: Configure branch name
+        id: branch_name
+        run: echo "GH_REF_NAME=$(echo "${{ github.event.ref }}" | sed 's|/|-|g')" >> $GITHUB_OUTPUT
+
+      - name: Delete Branch Container Image
+        uses: azure/cli@v2
+        with:
+          inlineScript: |
+            az acr repository delete \
+              --name ${{ env.AZURE_CONTAINER_REGISTRY }} \
+              --image ${{ github.event.repository.name }}:${{ matrix.platform}}-${{ steps.branch_name.outputs.GH_REF_NAME }} \
+              --yes
+  

.github/workflows/gh_delete_branch.yml

@@ -4,13 +4,36 @@ on:
   workflow_call:
 
 jobs:
-  call-az-acr-delete:
-    uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/az_acr_delete.yml@dev
-    secrets: inherit
-    with:
-      image_tag: "test-${{ github.event.pull_request.head.ref }}"
+  az-acr-delete-test:
+    name: "ACR: Delete Test Image"
+    runs-on: ubuntu-latest
+    environment: dev
+    env:
+      AZURE_CONTAINER_REGISTRY: ${{ vars.AZURE_CONTAINER_REGISTRY }}
+      ACR_LOGIN_USERNAME: ${{ secrets.ACR_LOGIN_USERNAME }}
+      ACR_LOGIN_PASSWORD: ${{ secrets.ACR_LOGIN_PASSWORD }}
+    steps:
+      - name: Azure Cloud Login
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+      
+      - name: Configure branch name
+        id: branch_name
+        run: echo "GH_REF_NAME=$(echo "test-${{ github.event.pull_request.head.ref }}" | sed 's|/|-|g')" >> $GITHUB_OUTPUT
+
+      - name: Delete Container Image
+        uses: azure/cli@v2
+        with:
+          inlineScript: |
+            az acr repository delete \
+              --name ${{ env.AZURE_CONTAINER_REGISTRY }} \
+              --image ${{ github.event.repository.name }}:${{ steps.branch_name.outputs.GH_REF_NAME }} \
+              --yes || true
 
-  az-acr-delete:
+  az-acr-delete-matrix:
     name: 'ACR: Delete Branch Images'
     runs-on: ubuntu-latest
     environment: dev
@@ -29,14 +52,17 @@ jobs:
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
+      - name: Configure branch name
+        id: branch_name
+        run: echo "GH_REF_NAME=$(echo "${{ github.event.pull_request.head.ref }}" | sed 's|/|-|g')" >> $GITHUB_OUTPUT
+
       - name: Delete Branch Container Image
         uses: azure/cli@v2
         with:
           inlineScript: |
-            GH_REF_NAME=$(echo ${{ github.event.pull_request.head.ref }} | sed 's|/|-|g')
             az acr repository delete \
               --name ${{ env.AZURE_CONTAINER_REGISTRY }} \
-              --image ${{ github.event.repository.name }}:${{ matrix.platform}}-${GH_REF_NAME} \
+              --image ${{ github.event.repository.name }}:${{ matrix.platform}}-${{ steps.branch_name.outputs.GH_REF_NAME }} \
               --yes
   
   gh-delete-branch:

.github/workflows/k8s_release.yml

@@ -45,9 +45,17 @@ jobs:
       deployment_status: "success"
       # deployment_status: ${{ needs.call-k8-deploy.outputs.deployment_status }}
 
-  call-gh-delete-branch:
-    # needs: [call-k8-deploy]
+  gh-delete-branch:
+    name: 'GitHub: Delete Branch'
+    runs-on: ubuntu-latest
     needs: [call-k8-edit]
     if: github.event_name == 'pull_request' && github.event.pull_request.merged && !failure() && !cancelled()
-    uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/gh_delete_branch.yml@dev
-    secrets: inherit
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GH_TOKEN }}
+      
+      - name: Delete Branch
+        shell: bash
+        run: git push origin --delete ${{ github.head_ref }}