rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't try to overwrite sync-wiki.yaml (#2355) 

* don't try to overwrite sync-wiki.yaml

* add comments
This commit is contained in:
David Holdeman 2021-02-14 21:04:00 -06:00 committed by GitHub
parent 70341538f0
commit c05adf024b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/sync-wiki.yaml vendored
View File

@ -37,7 +37,14 @@ jobs:
git show --name-only best-wiki-git/master git show --name-only best-wiki-git/master
git config --local user.email "action@github.com" git config --local user.email "action@github.com"
git config --local user.name "GitHub Action" git config --local user.name "GitHub Action"
git merge best-wiki-git/master # merge, but don't commit the merge
git merge --no-ff --no-commit best-wiki-git/master
# unstage the file
git reset HEAD .github/workflows/sync-wiki.yaml
# revert the file to its original state
git checkout -- .github/workflows/sync-wiki.yaml
# commit the merge
git commit -m "merge rusEFI wiki"
- name: Push changes to rusefi_documentation technical wiki - name: Push changes to rusefi_documentation technical wiki
uses: ad-m/github-push-action@master uses: ad-m/github-push-action@master