Update r2s_lienol.yml

This commit is contained in:
klever1988
2020-02-19 18:28:48 +08:00
committed by GitHub
parent fc6da901f7
commit d97f755d50

View File

@@ -1,4 +1,4 @@
name: r2s Lienol(Passwall) Build Lienol版openwrt(自带Passwall)
name: r2s Lienol版openwrt
on:
push:
@@ -45,60 +45,40 @@ jobs:
- name: Mods
run: |
cd friendlywrt-rk3328
cp ../r2s.config.seed configs/config_rk3328
. ../remove_used_config.sh
sed -i '/CONFIG_KERNEL_CGROUP_PERF/i\CONFIG_KERNEL_CGROUPS=y' configs/config_rk3328
echo '
CONFIG_OPENSSL_ENGINE_BUILTIN=y
CONFIG_OPENSSL_ENGINE_BUILTIN_DEVCRYPTO=y
CONFIG_OPENSSL_OPTIMIZE_SPEED=y
CONFIG_OPENSSL_WITH_DTLS=y
CONFIG_OPENSSL_WITH_EC2M=y
CONFIG_OPENSSL_WITH_NPN=y
CONFIG_PACKAGE_UnblockNeteaseMusic=y
# CONFIG_PACKAGE_iptables-mod-filter is not set
CONFIG_PACKAGE_ca-bundle=y
CONFIG_PACKAGE_curl=y
CONFIG_PACKAGE_kmod-crypto-authenc=y
# CONFIG_PACKAGE_kmod-crypto-ecb is not set
# CONFIG_PACKAGE_kmod-crypto-sha1 is not set
CONFIG_PACKAGE_kmod-cryptodev=y
# CONFIG_PACKAGE_kmod-gre is not set
# CONFIG_PACKAGE_kmod-ipt-filter is not set
# CONFIG_PACKAGE_kmod-lib-textsearch is not set
# CONFIG_PACKAGE_kmod-mppe is not set
CONFIG_PACKAGE_libgd=y
CONFIG_PACKAGE_libhttp-parser=y
CONFIG_PACKAGE_libjpeg=y
CONFIG_PACKAGE_libnghttp2=y
CONFIG_PACKAGE_libcurl=y
CONFIG_PACKAGE_libopenssl-conf=y
CONFIG_PACKAGE_libopenssl-devcrypto=y
CONFIG_PACKAGE_libpng=y
CONFIG_PACKAGE_libstdcpp=y
CONFIG_PACKAGE_luci-app-adguardhome=y
# CONFIG_PACKAGE_luci-app-control-mia is not set
# CONFIG_PACKAGE_luci-app-control-timewol is not set
# CONFIG_PACKAGE_luci-app-control-webrestriction is not set
# CONFIG_PACKAGE_luci-app-control-weburl 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-unblockmusic=y
CONFIG_PACKAGE_luci-app-vnstat=y
CONFIG_PACKAGE_luci-i18n-vnstat-zh-cn=y
CONFIG_PACKAGE_luci-app-smartdns=y
CONFIG_PACKAGE_luci-i18n-smartdns-zh-cn=y
CONFIG_PACKAGE_luci-theme-argon-dark-mod=y
CONFIG_PACKAGE_luci-theme-argon-light-mod=y
CONFIG_PACKAGE_node=y
# CONFIG_PACKAGE_pptpd is not set
# CONFIG_PACKAGE_rp-pppoe-common is not set
# CONFIG_PACKAGE_rp-pppoe-relay is not set
# CONFIG_PACKAGE_rp-pppoe-server is not set
CONFIG_PACKAGE_vnstat=y
CONFIG_PACKAGE_vnstati=y' >> configs/config_rk3328
CONFIG_PACKAGE_luci-theme-freifunk-generic=y
CONFIG_PACKAGE_luci-theme-material=y
CONFIG_PACKAGE_luci-theme-netgear-mc=y
CONFIG_PACKAGE_luci-theme-openwrt=y
CONFIG_PACKAGE_smartdns=y' >> configs/config_rk3328
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
git checkout upstream/dev-19.07 -b tmp
git revert 2202533d29c1494ad5645f87a7429e70f85a0110
git revert --no-edit 2202533d29c1494ad5645f87a7429e70f85a0110
git mv README.md README && git commit -m 'undo rename readme for rebasing'
git checkout origin/master
git rebase 90bb1cf9c33e73de5019686b8bd495f689e675a4^ --onto tmp -X theirs
git checkout upstream/dev-19.07 -- feeds.conf.default
sed -i '/exit/i\echo "iptables -t nat -I POSTROUTING -j MASQUERADE" >> /etc/firewall.user' package/default-settings/files/zzz-default-settings
- name: Clean Feeds
run: |