From 22170c684dea1d95985e724dc9bf6c55b5909f08 Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Sun, 1 Mar 2020 08:52:41 +0800 Subject: [PATCH] Update r2s_lienol.yml --- .github/workflows/r2s_lienol.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/r2s_lienol.yml b/.github/workflows/r2s_lienol.yml index ce62666..a55bb69 100644 --- a/.github/workflows/r2s_lienol.yml +++ b/.github/workflows/r2s_lienol.yml @@ -65,11 +65,12 @@ jobs: git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" git remote add upstream https://github.com/Lienol/openwrt && git fetch upstream git checkout upstream/dev-19.07 -b tmp - sed -i '/ucl upx/d' tools/Makefile && git add tools/Makefile git mv README.md README && git commit -m 'undo rename readme for rebasing' git checkout origin/master-v19.07.1 git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs + git revert --no-edit f092ca098e80c667b10cdd1dba328506a2673c1d git checkout upstream/dev-19.07 -- feeds.conf.default + sed -i '/ucl upx/d' tools/Makefile sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/default-settings/files/zzz-default-settings #sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh