Update r2s_lean.yml
This commit is contained in:
2
.github/workflows/r2s_lean.yml
vendored
2
.github/workflows/r2s_lean.yml
vendored
@@ -106,7 +106,7 @@ jobs:
|
|||||||
git remote add upstream https://github.com/coolsnowwolf/lede && git fetch upstream
|
git remote add upstream https://github.com/coolsnowwolf/lede && git fetch upstream
|
||||||
git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto upstream/master -X theirs
|
git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto upstream/master -X theirs
|
||||||
git checkout upstream/master -- feeds.conf.default
|
git checkout upstream/master -- feeds.conf.default
|
||||||
git commit -m 'update feeds' && git revert --no-edit a237f50d1dacc543ef3fa2364f696fd67f068c46
|
git commit -m 'update feeds' && git apply ../0001-fix-upx.patch
|
||||||
|
|
||||||
- name: Clean Feeds
|
- name: Clean Feeds
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
Reference in New Issue
Block a user