fix: pi_merge_submodule checkout

Author: andhreljaKern

.github/workflows/pi_merge_submodule.yml

@@ -31,7 +31,7 @@ jobs:
       repository: "${{ github.repository_owner }}/refinery-submodule-parent-images"
 
   pi-update-submodule:
-    name: 'Parent Images: Submodules'
+    name: 'Parent Images: Submodule'
     runs-on: ubuntu-latest
     needs: [pi-matrix, configure-branch-name]
     environment: dev
@@ -82,9 +82,9 @@ jobs:
             --repo ${{ github.repository_owner }}/refinery-${{ matrix.parent_image_type }}-parent-image
 
   pi-update-app:
-    name: 'Parent Images: ' # suffix populated by matrix
+    name: 'Parent Images: App'
     runs-on: ubuntu-latest
-    needs: [pi-matrix, configure-branch-name]
+    needs: [pi-matrix, configure-branch-name, pi-update-submodule]
     environment: dev
     continue-on-error: true
     env:
@@ -108,8 +108,16 @@ jobs:
         run: python -m pip install pip-tools
 
       - name: Clone ${{ matrix.app }}
-        run: git clone https://oauth2:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository_owner }}/${{ matrix.app }}.git
-      
+        run: |
+          git clone https://oauth2:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository_owner }}/${{ matrix.app }}.git
+          cd ${{ matrix.app }}
+
+          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 pull origin ${{ needs.configure-branch-name.outputs.gh_head_ref }} && git push origin ${{ needs.configure-branch-name.outputs.gh_head_ref }}
+
       - name: Compile Requirements
         run: |
           pip-compile --quiet \
@@ -124,14 +132,8 @@ jobs:
         run: |
           cd ${{ matrix.app }}
 
-          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 push origin ${{ needs.configure-branch-name.outputs.gh_head_ref }} && git pull origin ${{ needs.configure-branch-name.outputs.gh_head_ref }}
-
           git add requirements*
-          git commit -m "ci: update ${{ 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 }}
           echo "::notice::${{ matrix.app }} updated to origin/${{ needs.configure-branch-name.outputs.gh_head_ref }}"