Skip to content

Commit ea1906e

Browse files
committed
Revert "Update rebase-pr-workflow.yml"
This reverts commit 5cd36cf.
1 parent 5cd36cf commit ea1906e

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

.github/workflows/rebase-pr-workflow.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,30 @@ jobs:
1919
with:
2020
app_id: ${{ secrets.GMODNET_GITHUB_BOT_ID }}
2121
private_key: ${{ secrets.GMODNET_GITHUB_BOT_KEY }}
22-
22+
2323
- name: Configere Git User information
2424
run: |
2525
git config --global user.name "GmodNET GitHub Bot"
2626
git config --global user.email support@gmodnet.xyz
27-
27+
2828
- name: Checkout
2929
env:
3030
GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
3131
run: |
3232
gh repo clone ${{ github.repository }} ./
3333
gh pr checkout ${{ github.event.inputs.prNumber }}
34-
34+
3535
- name: Extract branch name
3636
uses: nelonoel/branch-name@v1.0.1
37-
37+
3838
- name: Rebase and push
3939
id: rebase_and_push
4040
continue-on-error: true
4141
run: |
42-
git remote set-url origin https://x-access-token:${{ steps.generate_token.outputs.token }}@github.com/${{ github.repository }}.git
43-
git fetch origin ${BRANCH_NAME}
4442
git rebase ${BRANCH_NAME}
43+
git remote set-url origin https://x-access-token:${{ steps.generate_token.outputs.token }}@github.com/${{ github.repository }}.git
4544
git push --force
46-
45+
4746
- name: Notify if rebase was unsuccessful
4847
if: steps.rebase_and_push.outcome == 'failure'
4948
env:

0 commit comments

Comments
 (0)