Update r2s_lienol.yml

This commit is contained in:
klever1988
2020-02-07 08:48:24 +08:00
committed by GitHub
parent a0bee6cd4d
commit 7cf25fcc50

View File

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