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

Update r2s_lean_minimal.yml

Browse Source
This commit is contained in:
klever1988
2020-07-06 05:51:43 +08:00
committed by GitHub
parent 3d1a222eb8
commit 49ae500182
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,7 +126,7 @@ 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/coolsnowwolf/lede && git fetch upstream git remote add upstream https://github.com/coolsnowwolf/lede && git fetch upstream
git checkout upstream/dev-lean-lede -b tmp git checkout upstream/master -b tmp
git revert --no-edit 33abeff31cfb2ae58adf167c82bd36b5f56a5b1c git revert --no-edit 33abeff31cfb2ae58adf167c82bd36b5f56a5b1c
git checkout origin/master-v19.07.1 git checkout origin/master-v19.07.1
git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs