diff --git a/.github/workflows/r1s_lean.yml b/.github/workflows/r1s_lean.yml index cc6e2d6..0f282d3 100644 --- a/.github/workflows/r1s_lean.yml +++ b/.github/workflows/r1s_lean.yml @@ -55,6 +55,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 revert --no-edit f092ca098e80c667b10cdd1dba328506a2673c1d git checkout upstream/master -- feeds.conf.default #git apply ../../0001-fix-upx.patch #sed -i '/ucl upx/d' tools/Makefile