yanistyle/nanopi-openwrt-r1s-h3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update r1s_lienol.yml

Browse Source
This commit is contained in:
klever1988
2020-02-18 16:03:08 +08:00
committed by GitHub
parent 0bbcce3352
commit 3ef8e602da
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/r1s_lienol.yml vendored
View File

@@ -52,11 +52,11 @@ jobs:
git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" 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 remote add upstream https://github.com/Lienol/openwrt && git fetch upstream
git checkout upstream/dev-19.07 -b tmp 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 mv README.md README && git commit -m 'undo rename readme for rebasing'
git checkout origin/master git checkout origin/master
git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto tmp -X theirs git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto tmp -X theirs
git checkout upstream/dev-19.07 -- feeds.conf.default git checkout upstream/dev-19.07 -- feeds.conf.default
git commit -m 'update feeds' && git apply ../../0001-fix-upx.patch
- name: Clean Feeds - name: Clean Feeds
run: | run: |