diff --git a/.github/workflows/r2s_lienol.yml b/.github/workflows/r2s_lienol.yml index d608b2f..b6ecc96 100644 --- a/.github/workflows/r2s_lienol.yml +++ b/.github/workflows/r2s_lienol.yml @@ -43,8 +43,7 @@ jobs: cd friendlywrt-rk3328 repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master-v19.07.1 -m rk3328.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle repo sync -c --no-clone-bundle -j8 - rm -rf friendlywrt/ - git clone https://github.com/friendlyarm/friendlywrt + cd friendlywrt/ && git fetch - name: Mods env: @@ -61,34 +60,7 @@ jobs: . ../remove_unused_config.sh cat configs/config_rk3328 | grep "TARGET" >> ../base_rk3328.seed cat ../base_rk3328.seed > configs/config_rk3328 - echo ' - CONFIG_OPENSSL_ENGINE_BUILTIN=y - CONFIG_OPENSSL_OPTIMIZE_SPEED=y - CONFIG_OPENSSL_WITH_DTLS=y - CONFIG_OPENSSL_WITH_EC2M=y - CONFIG_OPENSSL_WITH_NPN=y - CONFIG_PACKAGE_ipv6helper=y - CONFIG_PACKAGE_curl=y - CONFIG_PACKAGE_htop=y - CONFIG_PACKAGE_lrzsz=y - CONFIG_PACKAGE_nano=y - CONFIG_PACKAGE_vim-fuller=y - CONFIG_PACKAGE_luci-app-netdata=y - CONFIG_PACKAGE_luci-app-adbyby-plus=y - CONFIG_PACKAGE_luci-app-adguardhome=y - CONFIG_PACKAGE_luci-app-unblockneteasemusic-mini=y - CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Brook=y - CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Shadowsocks=y - 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-smartdns=y - CONFIG_PACKAGE_luci-theme-argon-dark-mod=y - CONFIG_PACKAGE_luci-theme-argon-light-mod=y - 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' >> configs/config_rk3328 + cat ../app_config.seed >> 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