Skip to content

Commit

Permalink
Update create-token-pr.yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
alizedebray committed Oct 16, 2024
1 parent 3d2f951 commit 4edf692
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/workflows/create-token-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
# Checkout the token branch which was pushed
- name: Checkout Token Branch
uses: actions/checkout@v4
with:
ref: ${{ github.ref_name }}

# Check if the PR branch corresponding to the token branch exists
- name: Get PR Branch
Expand All @@ -44,7 +46,6 @@ jobs:
run: |
git config user.name "Swiss Post Bot"
git config user.email "[email protected]"
git fetch origin ${{ github.ref_name }}
git merge ${{ github.ref_name }} -X theirs --no-edit
git push origin ${{ steps.pr-branch.outputs.name }}
env:
Expand Down

0 comments on commit 4edf692

Please sign in to comment.