Update r1s_lienol.yml
This commit is contained in:
2
.github/workflows/r1s_lienol.yml
vendored
2
.github/workflows/r1s_lienol.yml
vendored
@@ -59,7 +59,7 @@ 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
|
sed -i '/ipv6/,+3d' package/base-files/files/root/setup.sh
|
||||||
git checkout upstream/dev-19.07 -- feeds.conf.default
|
git checkout upstream/dev-19.07 -- feeds.conf.default
|
||||||
#git apply ../../enable_autocore.diff
|
#git apply ../../enable_autocore.diff
|
||||||
sed -i '/ucl upx/d' tools/Makefile
|
sed -i '/ucl upx/d' tools/Makefile
|
||||||
|
|||||||
Reference in New Issue
Block a user