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

Update r2s_lienol.yml

Browse Source
This commit is contained in:
klever1988
2020-02-07 08:48:24 +08:00
committed by GitHub
parent a0bee6cd4d
commit 7cf25fcc50
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/r2s_lienol.yml vendored
View File

@@ -49,8 +49,8 @@ jobs:
cd friendlywrt cd friendlywrt
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 rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto upstream/master -X theirs git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto upstream/my-19.07-full -X theirs
git checkout upstream/master -- feeds.conf.default git checkout upstream/my-19.07-full -- feeds.conf.default
- name: Clean Feeds - name: Clean Feeds
run: | run: |