Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Merge GitHub Action #162

Merged
merged 1 commit into from
Apr 11, 2024
Merged

Fix Merge GitHub Action #162

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/merge-main.yaml
View file
Open in desktop
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
Loading