diff --git a/.github/workflows/r2s_lean.yml b/.github/workflows/r2s_lean.yml index 1ef1558..f9ea580 100644 --- a/.github/workflows/r2s_lean.yml +++ b/.github/workflows/r2s_lean.yml @@ -14,7 +14,7 @@ jobs: build: runs-on: ubuntu-latest - if: github.event.repository.owner.id == '56048681' + if: github.repository == 'klever1988/nanopi-openwrt' steps: diff --git a/.github/workflows/r2s_lean_minimal.yml b/.github/workflows/r2s_lean_minimal.yml index c6d6abe..913577c 100644 --- a/.github/workflows/r2s_lean_minimal.yml +++ b/.github/workflows/r2s_lean_minimal.yml @@ -26,7 +26,6 @@ jobs: - name: Initialization Environment env: DEBIAN_FRONTEND: noninteractive - ownerid: github.event.repository.owner.id run: | sudo rm -rf /etc/apt/sources.list.d sudo apt-get update @@ -46,11 +45,11 @@ jobs: 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 --depth=1 repo sync -c --no-tags --no-clone-bundle -j8 cd friendlywrt/ && git fetch --unshallow - + - name: Patch Kernel run: | . patch_kernel_5.4.22.sh - + - name: Mods run: | cd friendlywrt-rk3328 @@ -128,8 +127,6 @@ jobs: git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto upstream/master -X theirs git revert --no-edit f092ca098e80c667b10cdd1dba328506a2673c1d git checkout upstream/master -- feeds.conf.default - git apply ../../enable_autocore.diff - git apply ../../fix_cpufreq.diff cd package/lean/ #git clone https://github.com/jerrykuku/lua-maxminddb.git #git clone https://github.com/jerrykuku/luci-app-vssr.git @@ -144,13 +141,15 @@ jobs: rm -rf luci-theme-argon git clone -b 18.06 https://github.com/jerrykuku/luci-theme-argon.git cd ../../ - sed -i '/exit/i\mv /etc/rc.d/S25dockerd /etc/rc.d/S92dockerd && sed -i "s/START=25/START=92/g" S92dockerd' package/lean/default-settings/files/zzz-default-settings + git apply ../../enable_autocore.diff + git apply ../../fix_cpufreq.diff 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 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config + sed -i '/exit/i\find /etc/rc.d/ -name *docker* -delete' package/lean/default-settings/files/zzz-default-settings 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 run: | cd friendlywrt-rk3328/friendlywrt diff --git a/.github/workflows/r2s_lienol_from_lean.yml b/.github/workflows/r2s_lienol_from_lean.yml index 53bc23d..679fcfd 100644 --- a/.github/workflows/r2s_lienol_from_lean.yml +++ b/.github/workflows/r2s_lienol_from_lean.yml @@ -55,9 +55,77 @@ jobs: cd friendlywrt-rk3328 . ../remove_unused_config.sh cat configs/config_rk3328 | grep "TARGET" >> ../base_rk3328.seed - cat ../app_config.seed >> ../base_rk3328.seed cat ../base_rk3328.seed > configs/config_rk3328 - echo '# CONFIG_V2RAY_COMPRESS_UPX is not set' >> configs/config_rk3328 + echo ' + CONFIG_PACKAGE_ipv6helper=y + CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y + CONFIG_OPENSSL_ENGINE_BUILTIN=y + CONFIG_OPENSSL_WITH_DTLS=y + CONFIG_OPENSSL_WITH_EC2M=y + CONFIG_OPENSSL_WITH_NPN=y + CONFIG_PACKAGE_autocore=y + CONFIG_PACKAGE_htop=y + CONFIG_PACKAGE_diffutils=y + CONFIG_PACKAGE_vim-fuller=y + CONFIG_PACKAGE_luci-app-frpc=y + CONFIG_PACKAGE_luci-app-netdata=y + CONFIG_LIBSODIUM_MINIMAL=y + CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_DNS2SOCKS=y + CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Redsocks2=y + CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks=y + CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Simple_obfs=y + CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Trojan=y + CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_V2ray=y + CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_V2ray_plugin=y + CONFIG_PACKAGE_luci-app-ssrserver-python=y + CONFIG_PACKAGE_luci-app-uhttpd=y + CONFIG_PACKAGE_luci-app-unblockmusic=y + CONFIG_PACKAGE_luci-app-v2ray-server=y + CONFIG_PACKAGE_luci-app-vssr=y + CONFIG_PACKAGE_luci-app-watchcat=y + CONFIG_PACKAGE_luci-theme-argon=y + CONFIG_PACKAGE_luci-theme-material=y + CONFIG_PACKAGE_luci-theme-netgear=y + CONFIG_PACKAGE_luci-app-unblockmusic=y + CONFIG_UnblockNeteaseMusic_Go=y + CONFIG_UnblockNeteaseMusic_NodeJS=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_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_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 @@ -114,12 +182,12 @@ jobs: draft: false prerelease: false - name: Upload Release Asset - id: upload-release-asset + id: upload-release-asset uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.sec_token }} with: - upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps + upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps asset_path: ./artifact.zip asset_name: ${{ steps.assemble_artifact.outputs.release_tag }}-ROM.zip asset_content_type: application/zip