Update r1s_lean.yml
This commit is contained in:
7
.github/workflows/r1s_lean.yml
vendored
7
.github/workflows/r1s_lean.yml
vendored
@@ -56,7 +56,12 @@ 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/coolsnowwolf/lede && git fetch upstream
|
||||
git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto upstream/master -X theirs
|
||||
git checkout upstream/master -b tmp
|
||||
git checkout 33f7cb735300bd9a099995236ed768c8925fec75 -- target/linux/sunxi/image/
|
||||
git rm README.md
|
||||
git commit -m 'reset'
|
||||
git checkout origin/master-v19.07.1
|
||||
git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto tmp -X theirs
|
||||
rm target/linux/allwinner-h5/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch
|
||||
git checkout upstream/master -- feeds.conf.default
|
||||
sed -i '5s/#src-git/src-git/g' feeds.conf.default
|
||||
|
||||
Reference in New Issue
Block a user