From 8abdc504915cd457a5cdeb2236ca4ad639e6eb2f Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Sat, 29 Feb 2020 02:52:02 +0800 Subject: [PATCH] Update r1s_lean.yml --- .github/workflows/r1s_lean.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/r1s_lean.yml b/.github/workflows/r1s_lean.yml index 8f1d3f5..5299ef4 100644 --- a/.github/workflows/r1s_lean.yml +++ b/.github/workflows/r1s_lean.yml @@ -41,8 +41,8 @@ jobs: run: | mkdir friendlywrt-h5 cd friendlywrt-h5 - repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master -m h5.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle - repo sync -c --no-clone-bundle + repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master -m h5.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle + repo sync -c --no-clone-bundle -j8 - name: Mods run: | @@ -61,11 +61,12 @@ jobs: CONFIG_PACKAGE_lrzsz=y CONFIG_PACKAGE_nano=y CONFIG_PACKAGE_vim-fuller=y - CONFIG_PACKAGE_luci-app-cifsd=y + CONFIG_PACKAGE_luci-app-frpc=y CONFIG_PACKAGE_luci-app-dockerman=y CONFIG_PACKAGE_luci-app-ipsec-vpnd=y CONFIG_PACKAGE_luci-app-netdata=y CONFIG_PACKAGE_luci-app-pptp-server=y + CONFIG_PACKAGE_luci-app-unblockneteasemusic-mini=y CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks=y CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ShadowsocksR_Server=y CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Simple_obfs=y @@ -87,15 +88,22 @@ jobs: git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto upstream/master -X theirs git checkout upstream/master -- feeds.conf.default git apply ../../0001-fix-upx.patch + cd package/lean/ + rm -rf luci-theme-argon + git clone -b 18.06 https://github.com/jerrykuku/luci-theme-argon.git + cd ../../ + sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon"' package/lean/default-settings/files/zzz-default-settings sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/lean/default-settings/files/zzz-default-settings sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh echo -e '\nDYC Build\n' >> package/base-files/files/etc/banner - - name: Clean Feeds + - name: Mod luci run: | cd friendlywrt-h5/friendlywrt - ./scripts/feeds clean -a + ./scripts/feeds update -a && ./scripts/feeds install -a + sed -i '/Load Average/i\<%:CPU Temperature%><%=luci.sys.exec("cut -c1-2 /sys/class/thermal/thermal_zone0/temp")%>' feeds/luci/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm + sed -i 's/pcdata(boardinfo.system or "?")/"ARMv8"/' feeds/luci/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm - name: Build FriendlyWrt run: |