From 3ef8e602da04102c9bed9b7ac1fca6f9fa2bf51a Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Tue, 18 Feb 2020 16:03:08 +0800 Subject: [PATCH] Update r1s_lienol.yml --- .github/workflows/r1s_lienol.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/r1s_lienol.yml b/.github/workflows/r1s_lienol.yml index 2b4d98c..572040d 100644 --- a/.github/workflows/r1s_lienol.yml +++ b/.github/workflows/r1s_lienol.yml @@ -52,11 +52,11 @@ 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 + git revert 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 upstream/dev-19.07 -- feeds.conf.default - git commit -m 'update feeds' && git apply ../../0001-fix-upx.patch - name: Clean Feeds run: |