From aa7b35dce5b3089e78f671fb478304f0c0f69c74 Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Sat, 2 May 2020 15:34:19 +0800 Subject: [PATCH] Update r1s_lean_h3.yml --- .github/workflows/r1s_lean_h3.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/r1s_lean_h3.yml b/.github/workflows/r1s_lean_h3.yml index 0fe8b88..e1f20b7 100644 --- a/.github/workflows/r1s_lean_h3.yml +++ b/.github/workflows/r1s_lean_h3.yml @@ -60,6 +60,9 @@ jobs: git remote add upstream https://github.com/coolsnowwolf/lede && git fetch upstream git rebase e561fa6fcc2e744c4a8cbfa1b4cf65107a675414^ --onto 1dee4bedde119aadc586ebf7105cfded3c220711 #bypass a commit that cause an error for next rebasing git rebase 52a38e950de0686cb5a2d3e8e05c38027a8e3d0d^ --onto upstream/master -X theirs + git revert --no-edit 4787dbaf3cad44b374b660cc0fef9386963e6795 + git revert --no-edit 463b6ac0508de4788a6e41335471ced0a255e1cd + git revert --no-edit 8faac30089ce616940b3e96c4f4d900aeb6b9fcb #rm target/linux/allwinner-h5/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch git checkout upstream/master -- feeds.conf.default sed -i '5s/#src-git/src-git/g' feeds.conf.default