Update create-token-pr.yaml

swisspost · Oct 28, 2024 · ba5d945 · ba5d945
1 parent dac3f2d
commit ba5d945
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/.github/workflows/create-token-pr.yaml b/.github/workflows/create-token-pr.yaml
@@ -20,6 +20,19 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Configure GitHub User
+        run: |
+          git config user.name "Swiss Post Bot"
+          git config user.email "[email protected]"
+
+      - name: Update Tokens Branch
+        run: |
+          git checkout ${{ github.ref_name }}
+          git merge origin/main -X ours --no-edit
+          git push
+        env:
+          GITHUB_TOKEN: ${{ secrets.SWISSPOSTDEVS_ACCESS_TOKEN }}
+
       # Check if a PR branch corresponding to the token branch exists
       - name: Get PR Branch
         id: pr-branch
@@ -37,8 +50,6 @@ jobs:
       - name: Update PR
         if: steps.pr-branch.outputs.exists == 'true'
         run: |
-          git config user.name "Swiss Post Bot"
-          git config user.email "[email protected]"
           git checkout ${{ steps.pr-branch.outputs.name }}
           git merge ${{ github.ref_name }} -X theirs --no-edit
           git push