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

Update r2s_lean.yml

Browse Source
This commit is contained in:
klever1988
2020-02-17 11:40:44 +08:00
committed by GitHub
parent 152266f529
commit 823787964b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/r2s_lean.yml vendored
View File

@@ -99,13 +99,14 @@ jobs:
CONFIG_boost-compile-visibility-hidden=y CONFIG_boost-compile-visibility-hidden=y
CONFIG_boost-runtime-shared=y CONFIG_boost-runtime-shared=y
CONFIG_boost-static-and-shared-libs=y CONFIG_boost-static-and-shared-libs=y
CONFIG_boost-variant-release=y CONFIG_boost-variant-release=y' >> configs/config_rk3328
# CONFIG_V2RAY_COMPRESS_UPX is not set' >> configs/config_rk3328 # CONFIG_V2RAY_COMPRESS_UPX is not set
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 rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto upstream/master -X theirs git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto upstream/master -X theirs
git checkout upstream/master -- feeds.conf.default git checkout upstream/master -- feeds.conf.default
git revert 9477f7695cec4beefa34aaf6a0bfb619520c48d6
- name: Clean Feeds - name: Clean Feeds
run: | run: |