Skip to content

Commit

Permalink
Fixing CI
Browse files Browse the repository at this point in the history
  • Loading branch information
akasaka committed Oct 27, 2024
1 parent d54f751 commit 4b5c5b2
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,11 @@ jobs:
name: filesystem.zip
if-no-files-found: error
- name: Switch to public branch
run: git checkout pub
run: |
cp ./data/FS_VER /tmp/FS_VER
git checkout HEAD -- ./data/FS_VER
git checkout pub
cp /tmp/FS_VER ./data/FS_VER
- name: Merge changes from main
run: git merge main --strategy-option theirs
- name: Move things to FVUDATA for publishing
Expand Down

0 comments on commit 4b5c5b2

Please sign in to comment.