Update r1s_lean_h3.yml
This commit is contained in:
1
.github/workflows/r1s_lean_h3.yml
vendored
1
.github/workflows/r1s_lean_h3.yml
vendored
@@ -56,6 +56,7 @@ 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 e561fa6fcc2e744c4a8cbfa1b4cf65107a675414^ --onto 1dee4bedde119aadc586ebf7105cfded3c220711 #bypass a commit that cause an error for next rebasing
|
||||
git rebase 52a38e950de0686cb5a2d3e8e05c38027a8e3d0d^ --onto upstream/master -X theirs
|
||||
git checkout upstream/master -- feeds.conf.default
|
||||
cd package/lean/
|
||||
|
||||
Reference in New Issue
Block a user