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

Update r2s_lean_minimal.yml

Browse Source
This commit is contained in:
klever1988
2020-03-01 17:53:41 +08:00
committed by GitHub
parent f0a5eef928
commit 663c6476a2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/r2s_lean_minimal.yml vendored
View File

@@ -115,10 +115,10 @@ 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 adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto upstream/master -X theirs git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto upstream/master -X theirs
#git revert --no-edit f092ca098e80c667b10cdd1dba328506a2673c1d git revert --no-edit f092ca098e80c667b10cdd1dba328506a2673c1d
sed -i '/ucl upx/d' tools/Makefile
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
cd package/lean/ cd package/lean/
git clone https://github.com/jerrykuku/lua-maxminddb.git git clone https://github.com/jerrykuku/lua-maxminddb.git
git clone https://github.com/jerrykuku/luci-app-vssr.git git clone https://github.com/jerrykuku/luci-app-vssr.git