Update r1s_lienol.yml

This commit is contained in:
klever1988
2020-02-21 08:05:47 +08:00
committed by GitHub
parent 464a2489d4
commit 51bac70cb7

View File

@@ -41,6 +41,8 @@ jobs:
cd friendlywrt-h5
repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master -m h5.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle
repo sync -c --no-clone-bundle
rm -rf friendlywrt/
git clone https://github.com/friendlyarm/friendlywrt
- name: Mods
run: |
@@ -72,11 +74,13 @@ jobs:
git checkout upstream/dev-19.07 -b tmp
git revert --no-edit 2202533d29c1494ad5645f87a7429e70f85a0110
git mv README.md README && git commit -m 'undo rename readme for rebasing'
git checkout origin/master
git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto tmp -X theirs
git checkout origin/master-v19.07.1
git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs
git cherry-pick origin/master 8f734f05f11b9f94af3cf1469537587ef102e5f2^...origin/HEAD
git checkout upstream/dev-19.07 -- feeds.conf.default
#sed -i '/exit/i\echo "iptables -t nat -I POSTROUTING -j MASQUERADE" >> /etc/firewall.user' package/default-settings/files/zzz-default-settings
sed -i 's/option fullcone 1/option fullcone 0/' package/network/config/firewall/files/firewall.config
sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh
- name: Clean Feeds
run: |