Skip to content

Commit

Permalink
Fix Merge GitHub Action (#162)
Browse files Browse the repository at this point in the history
  • Loading branch information
jakubswierczek authored Apr 11, 2024
1 parent 8eca601 commit ccd5120
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/merge-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,23 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 20
- name: git config
run: |
git config user.name ${{ github.actor }}
- name: Merge dev -> main
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
run: |
git status
git pull
git fetch
git checkout dev
git pull
git checkout main
git rebase dev
git push origin main
Expand Down

0 comments on commit ccd5120

Please sign in to comment.