Update r1s_lienol.yml
This commit is contained in:
2
.github/workflows/r1s_lienol.yml
vendored
2
.github/workflows/r1s_lienol.yml
vendored
@@ -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: |
|
||||
|
||||
Reference in New Issue
Block a user