From 69f31303423aecc36c2e48625e8bc09d7cb0f589 Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Tue, 7 Jul 2020 17:06:44 +0800 Subject: [PATCH] Update r1s_lean.yml --- .github/workflows/r1s_lean.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/r1s_lean.yml b/.github/workflows/r1s_lean.yml index f6119bd..7d665d1 100644 --- a/.github/workflows/r1s_lean.yml +++ b/.github/workflows/r1s_lean.yml @@ -60,7 +60,7 @@ jobs: git checkout 33f7cb735300bd9a099995236ed768c8925fec75 -- target/linux/sunxi/image/ git rm README.md git commit -m 'reset' - git checkout origin/master-v19.07.1 + git checkout origin/master git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto tmp -X theirs rm target/linux/allwinner-h5/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch git checkout upstream/master -- feeds.conf.default