ci: addresses issues with workflows mirroring changes to deployments (resolves #2361, #2362) (#2363)

* ci: trigger mirror action after release

* ci: allow mirror workflows to be triggered manually

Author: jobara

.github/workflows/merge-release.yml

@@ -27,6 +27,12 @@ jobs:
     name: Merge tag
 
     steps:
+    - uses: actions/create-github-app-token@v1
+      id: app-token
+      with:
+        app-id: ${{ vars.GHA_APP_ID }}
+        private-key: ${{ secrets.GHA_PRIVATE_KEY }}
+
     - name: Determine branch
       run: |
         echo 'BRANCH='${{ inputs.branch || 'staging' }} >> $GITHUB_ENV
@@ -37,12 +43,7 @@ jobs:
         ref: ${{ env.BRANCH }}
         fetch-tags: true
         fetch-depth: 0
-
-    - uses: actions/create-github-app-token@v1
-      id: app-token
-      with:
-        app-id: ${{ vars.GHA_APP_ID }}
-        private-key: ${{ secrets.GHA_PRIVATE_KEY }}
+        token: ${{ steps.app-token.outputs.token }}
 
     - name: Get GitHub App User ID
       if: ${{ github.event_name == 'release' }}
@@ -78,14 +79,9 @@ jobs:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         ACCOUNT_ID: ${{ github.actor_id }}
 
-    - name: Merge tag to local "${{ env.BRANCH }}" branch
+    - name: Merge tag to "${{ env.BRANCH }}" branch
       run: |
           git config --local user.email "$GIT_USER_EMAIL"
           git config --local user.name "$GIT_USER_NAME"
           git merge ${{ inputs.tag || github.event.release.tag_name }}
-
-    - name: Push merge to repository's "${{ env.BRANCH }}" branch
-      uses: ad-m/[email protected]
-      with:
-        github_token: ${{ steps.app-token.outputs.token }}
-        branch: ${{ env.BRANCH }}
+          git push

.github/workflows/mirror-dev.yml

@@ -15,6 +15,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
+          ref: dev
           fetch-depth: 0
 
       - name: Set up Git

.github/workflows/mirror-production.yml

@@ -15,6 +15,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
+          ref: production
           fetch-depth: 0
 
       - name: Set up Git

.github/workflows/mirror-staging.yml

@@ -15,6 +15,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
+          ref: staging
           fetch-depth: 0
 
       - name: Set up Git