From 4d5f923b2bddcfe3f7c36003376a57ae8b81cc73 Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Tue, 25 Feb 2020 21:08:18 +0800 Subject: [PATCH] Update r1s_lean.yml --- .github/workflows/r1s_lean.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/r1s_lean.yml b/.github/workflows/r1s_lean.yml index 73ea590..16deaf0 100644 --- a/.github/workflows/r1s_lean.yml +++ b/.github/workflows/r1s_lean.yml @@ -43,6 +43,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: | @@ -85,6 +87,7 @@ jobs: 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 rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto upstream/master -X theirs + git cherry-pick origin/master-v19.07.1 aea926c37bf7fbaf6a9fd4142d29b2f9c659cc01^...origin/master-v19.07.1 git checkout upstream/master -- feeds.conf.default git apply ../../0001-fix-upx.patch sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/lean/default-settings/files/zzz-default-settings