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

Update r1s_lean.yml

Browse Source
This commit is contained in:
klever1988
2020-03-05 22:52:10 +08:00
committed by GitHub
parent bd8a867c66
commit daebf0a672
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/r1s_lean.yml vendored
View File

@@ -55,6 +55,7 @@ jobs:
git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" git config --local user.email "action@github.com" && git config --local user.name "GitHub Action"
git remote add upstream https://github.com/coolsnowwolf/lede && git fetch upstream git remote add upstream https://github.com/coolsnowwolf/lede && git fetch upstream
git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto upstream/master -X theirs git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto upstream/master -X theirs
git revert --no-edit f092ca098e80c667b10cdd1dba328506a2673c1d
git checkout upstream/master -- feeds.conf.default git checkout upstream/master -- feeds.conf.default
#git apply ../../0001-fix-upx.patch #git apply ../../0001-fix-upx.patch
#sed -i '/ucl upx/d' tools/Makefile #sed -i '/ucl upx/d' tools/Makefile