From 11014491cad9bb60cd731c9e5949a01c11addf5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aliz=C3=A9=20Debray?= Date: Mon, 28 Oct 2024 16:51:16 +0100 Subject: [PATCH] Update create-token-pr.yaml --- .github/workflows/create-token-pr.yaml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-token-pr.yaml b/.github/workflows/create-token-pr.yaml index 1aa53365a3..5fd6c4f9c7 100644 --- 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 "103635272+swisspost-bot@users.noreply.github.com" + + - name: Update Tokens Branch + run: | + git checkout ${{ github.ref_name }} + git merge origin/main -X yours --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 "103635272+swisspost-bot@users.noreply.github.com" git checkout ${{ steps.pr-branch.outputs.name }} git merge ${{ github.ref_name }} -X theirs --no-edit git push