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

Update r2s_lienol_from_lean.yml

Browse Source
This commit is contained in:
klever1988
2020-04-10 17:40:51 +08:00
committed by GitHub
parent 3753544d4d
commit 8bbb318ce7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/r2s_lienol_from_lean.yml vendored
View File

@@ -129,7 +129,8 @@ jobs:
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
git revert --no-edit f092ca098e80c667b10cdd1dba328506a2673c1d #git revert --no-edit f092ca098e80c667b10cdd1dba328506a2673c1d
sed -i '/ipv6/,+3d' package/base-files/files/root/setup.sh
git checkout upstream/dev-lean-lede -- feeds.conf.default git checkout upstream/dev-lean-lede -- feeds.conf.default
cd package/lean/ cd package/lean/
rm -rf luci-theme-argon rm -rf luci-theme-argon