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

Update r2s_lienol_from_lean.yml

Browse Source
This commit is contained in:
klever1988
2020-03-30 12:45:17 +08:00
committed by GitHub
parent e9006f6bde
commit d839b4ba38
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/r2s_lienol_from_lean.yml vendored
View File

@@ -1,4 +1,4 @@
name: r2s Lienol版openwrt based on Lean name: r2s Lienol版openwrt based on Lean
on: on:
push: push:
@@ -121,7 +121,9 @@ 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 adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto upstream/dev-lean-lede -X theirs git checkout upstream/dev-lean-lede -b tmp
git mv README.md README && git commit -m 'undo rename readme for rebasing'
git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs
git revert --no-edit f092ca098e80c667b10cdd1dba328506a2673c1d git revert --no-edit f092ca098e80c667b10cdd1dba328506a2673c1d
git checkout upstream/dev-lean-lede -- feeds.conf.default git checkout upstream/dev-lean-lede -- feeds.conf.default
cd package/lean/ cd package/lean/