fix: update git operations in pi workflows

Author: andhreljaKern

.github/workflows/pi_merge_parent_image.yml

@@ -13,16 +13,6 @@ env:
   GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
 jobs:
-  configure-branch-name:
-    name: 'Configure Head Branch Name'
-    runs-on: ubuntu-latest
-    outputs:
-      gh_head_ref: ${{ steps.configure-branch-name.outputs.gh_head_ref }}
-    steps:
-      - name: Configure branch name
-        id: configure-branch-name
-        run: echo "gh_head_ref=$(echo "${{ github.event.pull_request.head.ref }}" | sed 's|/|-|g')" >> $GITHUB_OUTPUT
-
   pi-matrix:
     uses: code-kern-ai/cicd-deployment-scripts/.github/workflows/pi_matrix.yml@dev
     secrets: inherit
@@ -138,11 +128,12 @@ jobs:
   pi-update-app:
     name: 'Parent Images: App'
     runs-on: ubuntu-latest
-    needs: [pi-matrix, configure-branch-name, pi-build]
+    needs: [pi-matrix, pi-build]
     environment: dev
     continue-on-error: true
     env:
       PYTHON_VERSION: ${{ vars.PYTHON_VERSION }}
+      HEAD_REF: parent-image-updates
     strategy:
       matrix: 
         include: ${{ fromJson(needs.pi-matrix.outputs.include) }}
@@ -170,7 +161,7 @@ jobs:
           git config user.email "[email protected]"
           git config user.name "GitHub Actions"
 
-          git checkout -b ${{ needs.configure-branch-name.outputs.gh_head_ref }} || git checkout ${{ needs.configure-branch-name.outputs.gh_head_ref }}
+          git checkout -b ${{ env.HEAD_REF }} || git checkout ${{ env.HEAD_REF }}
 
       - name: Compile Requirements (Python)
         if: matrix.parent_image_type != 'next'
@@ -195,7 +186,7 @@ jobs:
 
           git add requirements/${{ matrix.parent_image_type }}-requirements.txt
           git commit -m "ci: update ${{ matrix.parent_image_type }}-requirements.txt" || true
-          git push origin ${{ needs.configure-branch-name.outputs.gh_head_ref }}
+          git push origin ${{ env.HEAD_REF }}
           echo "::notice::${{ matrix.app }} - updated ${{ matrix.parent_image_type }}-requirements.txt"
 
           export exitcode=0
@@ -209,15 +200,15 @@ jobs:
           else
             git add requirements.txt
             git commit -m "ci: update requirements.txt" || true
-            git push origin ${{ needs.configure-branch-name.outputs.gh_head_ref }}
+            git push origin ${{ env.HEAD_REF }}
             echo "::notice::${{ matrix.app }} - updated requirements.txt"
           fi
 
           gh pr create --draft \
             --title "${{ github.event.pull_request.title }}" \
             --body "${{ github.event.pull_request.body }}" \
             --base dev \
-            --head ${{ needs.configure-branch-name.outputs.gh_head_ref }} \
+            --head ${{ env.HEAD_REF }} \
             --repo ${{ github.repository_owner }}/${{ matrix.app }} || true
           
       - name: Perform Edit/Git Operations (Next)
@@ -227,14 +218,14 @@ jobs:
 
           git add package.json
           git commit -m "ci: update ${{ matrix.parent_image_type }} package.json" || true
-          git push origin ${{ needs.configure-branch-name.outputs.gh_head_ref }}
+          git push origin ${{ env.HEAD_REF }}
           echo "::notice::${{ matrix.app }} - updated ${{ matrix.parent_image_type }} package.json"
 
           gh pr create --draft \
             --title "${{ github.event.pull_request.title }}" \
             --body "${{ github.event.pull_request.body }}" \
             --base dev \
-            --head ${{ needs.configure-branch-name.outputs.gh_head_ref }} \
+            --head ${{ env.HEAD_REF }} \
             --repo ${{ github.repository_owner }}/${{ matrix.app }} || true
 
   gh-delete-branch:

.github/workflows/pi_release.yml

@@ -34,6 +34,7 @@ jobs:
       PARENT_IMAGE_NAME: ${{ vars.PARENT_IMAGE_NAME }}
       PARENT_IMAGE_TYPE: ${{ vars.PARENT_IMAGE_TYPE }}
       DOCKERFILE: ${{ vars.DOCKERFILE }}
+      HEAD_REF: parent-image-updates
     strategy:
       matrix:
         include: ${{ fromJson(needs.pi-matrix.outputs.include) }}
@@ -51,11 +52,10 @@ jobs:
         run: |
           RELEASE_IMAGE="${{ env.DOCKERHUB_CONTAINER_REGISTRY }}/${{ env.PARENT_IMAGE_NAME }}:${{ github.event.release.tag_name }}-${{ matrix.parent_image_type }}"
           BASE_REF="dev"
-          HEAD_REF="parent-images"
           PR_TITLE="ci(pi): $RELEASE_IMAGE"
           
-          git branch -D "$HEAD_REF" || true
-          git checkout -b "$HEAD_REF"
+          git checkout "${{ env.HEAD_REF }}" || git checkout -b "${{ env.HEAD_REF }}"
+          git push origin "${{ env.HEAD_REF }}" && git pull origin "${{ env.HEAD_REF }}"
 
           bash cicd-deployment-scripts/pi/edit_dockerfile.sh \
             -i ${{ env.PARENT_IMAGE_NAME }} \
@@ -69,12 +69,12 @@ jobs:
 
           git add ${{ env.DOCKERFILE }}
           git commit -m "$PR_TITLE" || true
-          git push --force origin "$HEAD_REF"
+          git push --force origin "${{ env.HEAD_REF }}"
           echo "::notice::${{ matrix.app }} updated to $RELEASE_IMAGE"
 
           bash cicd-deployment-scripts/pi/pr_create.sh \
             -b "$BASE_REF" \
-            -h "$HEAD_REF" \
+            -h "${{ env.HEAD_REF }}" \
             -t "$PR_TITLE" \
             -o ${{ github.repository_owner }} \
             -r ${{ github.event.repository.name }} \