Update r2s_passwall.yml

.github/workflows/r2s_passwall.yml

@@ -1,9 +1,8 @@
-name: r2s Passwall Build 原版friendlywrt合并passwall插件
+name: r2s 原版friendlywrt合并passwall插件
 
 on:
   push:
     paths:
-      - 'r2s_passwall.seed'
       - '.github/workflows/r2s_passwall.yml'
   schedule:
     - cron: '10 13 * * *'
@@ -49,8 +48,41 @@ jobs:
           cp ../rk3328.xml .repo/manifests/rk3328.xml
           repo sync -c  --no-clone-bundle
           sed -i 's/dnsmasq /dnsmasq-full /' friendlywrt/include/target.mk
-          echo >> friendlywrt/feeds.conf.default && echo 'src-git lienol https://github.com/Lienol/openwrt-package' >> friendlywrt/feeds.conf.default
-          cp ../r2s_passwall.seed configs/config_rk3328
+          echo 'src-git lienol https://github.com/Lienol/openwrt-package' >> friendlywrt/feeds.conf.default
+          echo 'src-git darkmatter https://github.com/Lienol/luci-theme-darkmatter;luci-18.06' >> friendlywrt/feeds.conf.default
+          . ../remove_used_config.sh
+          sed -i 's/_zh-cn/_zh_Hans/' configs/config_rk3328
+          sed -i 's/_zh-tw/_zh_Hant/' configs/config_rk3328
+          echo '
+          CONFIG_OPENSSL_ENGINE=y
+          CONFIG_OPENSSL_ENGINE_BUILTIN=y
+          CONFIG_OPENSSL_OPTIMIZE_SPEED=y
+          CONFIG_OPENSSL_WITH_ASM=y
+          CONFIG_OPENSSL_WITH_CHACHA_POLY1305=y
+          CONFIG_OPENSSL_WITH_CMS=y
+          CONFIG_OPENSSL_WITH_DEPRECATED=y
+          CONFIG_OPENSSL_WITH_DTLS=y
+          CONFIG_OPENSSL_WITH_EC2M=y
+          CONFIG_OPENSSL_WITH_ERROR_MESSAGES=y
+          CONFIG_OPENSSL_WITH_NPN=y
+          CONFIG_OPENSSL_WITH_PSK=y
+          CONFIG_OPENSSL_WITH_SRP=y
+          CONFIG_OPENSSL_WITH_TLS13=y
+          CONFIG_PACKAGE_curl=y
+          CONFIG_PACKAGE_libopenssl=y
+          CONFIG_PACKAGE_luci-app-passwall=y
+          CONFIG_PACKAGE_luci-app-passwall_INCLUDE_Trojan=y
+          # CONFIG_PACKAGE_luci-app-passwall_INCLUDE_dns2socks is not set
+          CONFIG_PACKAGE_luci-theme-argon-dark-mod=y
+          CONFIG_PACKAGE_luci-theme-argon-light-mod=y
+          CONFIG_PACKAGE_luci-theme-bootstrap=y
+          CONFIG_PACKAGE_luci-theme-bootstrap-mod=y
+          CONFIG_PACKAGE_luci-theme-darkmatter=y
+          CONFIG_PACKAGE_luci-theme-material=y
+          CONFIG_PACKAGE_luci-theme-netgear-mc=y
+          CONFIG_PACKAGE_luci-theme-openwrt=y
+          CONFIG_PACKAGE_luci-theme-rosy=y
+          # CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM is not set' >> configs/config_rk3328
           
       - name: Clean Feeds
         run: |