OpenSource/homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use rebase for fork sync

Browse Source
This commit is contained in:
Aaron Dalton 2024-03-24 19:11:37 -04:00
parent 022b3cbf19
commit 618fc1f7e1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/fork-sync.yml vendored
View File

@ -37,10 +37,8 @@ jobs:
if: ${{inputs.tags || steps.fetch-upstream-tags.outputs.NEW_TAGS}} if: ${{inputs.tags || steps.fetch-upstream-tags.outputs.NEW_TAGS}}
run: | run: |
for TAG in ${NEW_TAGS}; do for TAG in ${NEW_TAGS}; do
git checkout -b release/${TAG} ${TAG} git checkout -b release/${TAG} main
git rm .github/workflows/* git rebase -onto ${TAG} upstream/main
git commit -m "Remove existing workflows"
git rev-list --no-merges --reverse main ^upstream/main | git cherry-pick --stdin --keep-redundant-commits
done done
for TAG in ${NEW_TAGS}; do for TAG in ${NEW_TAGS}; do
git push -u origin release/${TAG} git push -u origin release/${TAG}