Update r2s_lienol_from_lean.yml

This commit is contained in:
klever1988
2020-03-17 23:21:12 +08:00
committed by GitHub
parent a3f7de5ba1
commit d83a4d7e2a

View File

@@ -95,43 +95,24 @@ jobs:
CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Trojan=y
CONFIG_PACKAGE_luci-app-passwall_INCLUDE_simple-obfs=y
CONFIG_PACKAGE_luci-app-passwall_INCLUDE_v2ray-plugin=y
# CONFIG_PACKAGE_luci-app-accesscontrol is not set
# CONFIG_PACKAGE_luci-app-nlbwmon is not set
# CONFIG_PACKAGE_luci-app-pppoe-relay is not set
# CONFIG_PACKAGE_luci-app-pppoe-server is not set
# CONFIG_PACKAGE_luci-app-pptp-vpnserver-manyusers is not set
# CONFIG_PACKAGE_luci-app-sqm is not set
# CONFIG_PACKAGE_luci-app-ssr-python-pro-server is not set
# CONFIG_PACKAGE_luci-app-v2ray-server is not set
# CONFIG_PACKAGE_iptables-mod-conntrack-extra is not set
# CONFIG_PACKAGE_iptables-mod-ipopt is not set
# CONFIG_PACKAGE_kmod-crypto-authenc is not set
# CONFIG_PACKAGE_kmod-cryptodev is not set
# CONFIG_PACKAGE_kmod-ifb is not set
# CONFIG_PACKAGE_kmod-ipt-conntrack-extra is not set
# CONFIG_PACKAGE_kmod-ipt-ipopt is not set
# CONFIG_PACKAGE_kmod-nf-conntrack-netlink is not set
# CONFIG_PACKAGE_kmod-sched-cake is not set
# CONFIG_PACKAGE_kmod-sched-core is not set
# CONFIG_PACKAGE_kmod-tun is not set
# CONFIG_PACKAGE_libminiupnpc is not set
# CONFIG_PACKAGE_libnatpmp is not set
# CONFIG_PACKAGE_libopenssl-devcrypto is not set
# CONFIG_PACKAGE_luci-app-accesscontrol is not set
# CONFIG_PACKAGE_luci-app-nlbwmon is not set
# CONFIG_PACKAGE_luci-app-sqm is not set
# CONFIG_PACKAGE_luci-app-vsftpd is not set
# CONFIG_PACKAGE_luci-app-vssr_INCLUDE_ShadowsocksR_Socks is not set
# CONFIG_PACKAGE_luci-app-zerotier is not set
# CONFIG_PACKAGE_nlbwmon is not set
# CONFIG_PACKAGE_sqm-scripts is not set
# CONFIG_PACKAGE_tc is not set
# CONFIG_PACKAGE_vsftpd-alt is not set
# CONFIG_PACKAGE_zerotier is not set
# CONFIG_TARGET_ROOTFS_TARGZ is not set
# CONFIG_OPENSSL_ENGINE_BUILTIN_DEVCRYPTO is not set
# CONFIG_PACKAGE_kmod-crypto-authenc is not set
# CONFIG_PACKAGE_kmod-cryptodev is not set
# CONFIG_PACKAGE_libopenssl-devcrypto is not set
# CONFIG_V2RAY_COMPRESS_UPX is not set
' >> configs/config_rk3328
# CONFIG_PACKAGE_luci-app-cpufreq is not set
cd friendlywrt
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
@@ -151,12 +132,14 @@ jobs:
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: Mod luci
- name: Add OpenClash
run: |
cd friendlywrt-rk3328/friendlywrt
./scripts/feeds update -a && ./scripts/feeds install -a
sed -i '/Load Average/i\<tr><td width="33%"><%:CPU Temperature%></td><td><%=luci.sys.exec("cut -c1-2 /sys/class/thermal/thermal_zone0/temp")%></td></tr>' 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
git clone https://github.com/vernesong/OpenClash.git
mv OpenClash/luci-app-openclash friendlywrt-rk3328/friendlywrt/package
cd friendlywrt-rk3328/friendlywrt/package/base-files/files
mkdir -p etc/openclash && cd etc/openclash
curl -L https://github.com/Dreamacro/clash/releases/download/v0.18.0/clash-linux-armv8-v0.18.0.gz | gunzip > clash
chmod +x clash
- name: Build FriendlyWrt
run: |
@@ -175,7 +158,7 @@ jobs:
mv friendlywrt-rk3328/out/*img* ./artifact/
cp friendlywrt-rk3328/friendlywrt/.config ./artifact/
zip -r artifact.zip ./artifact/
release_tag="R2S-testcombined-$(date +%Y-%m-%d)"
release_tag="R2S-testcombined_with_openclash-$(date +%Y-%m-%d)"
echo "##[set-output name=release_tag;]$release_tag"
- name: Create Release
id: create_release