yanistyle/nanopi-openwrt-r1s-h3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update r1s_lienol.yml

Browse Source
This commit is contained in:
klever1988
2020-02-25 04:54:53 +08:00
committed by GitHub
parent 48ac062403
commit 9743bc88bc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/r1s_lienol.yml vendored
View File

@@ -79,7 +79,7 @@ jobs:
git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream
git checkout upstream/dev-19.07 -b tmp git checkout upstream/dev-19.07 -b tmp
#git revert --no-edit 2202533d29c1494ad5645f87a7429e70f85a0110 #git revert --no-edit 2202533d29c1494ad5645f87a7429e70f85a0110
sed -i '/ucl upx/d' tools/Makefile sed -i '/ucl upx/d' tools/Makefile && git add tools/Makefile
git mv README.md README && git commit -m 'undo rename readme for rebasing' git mv README.md README && git commit -m 'undo rename readme for rebasing'
git checkout origin/master-v19.07.1 git checkout origin/master-v19.07.1
git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs