Skip to content

Commit

Permalink
Fix sync_main_to_latest workflow (#206)
Browse files Browse the repository at this point in the history
* Fix sync_to_main workflow to fetch branches before merging main to
latest.

Git fetch.

Merge origin main

* Remove test branch.
  • Loading branch information
arriolac authored Feb 6, 2024
1 parent 2ffbaa8 commit 2cc47d6
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/workflows/sync_main_latest.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: Sync main and latest
on:
workflow_dispatch:
push:
branches:
- main
Expand All @@ -13,7 +14,7 @@ jobs:
uses: actions/checkout@v3

- name: Merge main into latest
run: git checkout latest && git merge main
run: git fetch && git switch latest && git merge origin/main

- name: Create pull request
id: cpr
Expand Down

0 comments on commit 2cc47d6

Please sign in to comment.