diff --git a/.github/workflows/build-padavan.yml b/.github/workflows/build-padavan.yml index 3af88b853c..f44bcd222c 100644 --- a/.github/workflows/build-padavan.yml +++ b/.github/workflows/build-padavan.yml @@ -16,7 +16,7 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 if: github.event.repository.owner.id == github.event.sender.id steps: @@ -32,7 +32,7 @@ jobs: pkg-config zlib1g-dev libgmp3-dev libmpc-dev libmpfr-dev libncurses5-dev libltdl-dev wget - name: Clone source code env: - KERNEL: 3.4 + KERNEL: 4.4 run: | if [ $KERNEL = "4.4" ] ; then git clone --depth=1 https://github.com/MeIsReallyBa/padavan-4.4.git /opt/rt-n56u @@ -44,8 +44,8 @@ jobs: mkdir -p /opt/images/ - name: Build Firmware env: - TNAME: K2P - KERNEL: 3.4 + TNAME: K2P_nano + KERNEL: 4.4 run: | cd /opt/rt-n56u/trunk if [ ! -f configs/templates/$TNAME.config ] ; then @@ -76,39 +76,39 @@ jobs: if [ $KERNEL = "4.4" ] ; then echo "CONFIG_FIRMWARE_INCLUDE_MENTOHUST=n" >> .config #MENTOHUST echo "CONFIG_FIRMWARE_INCLUDE_SCUTCLIENT=n" >> .config #SCUTCLIENT - echo "CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS=y" >> .config #SS plus+ + echo "CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS=n" >> .config #SS plus+ echo "CONFIG_FIRMWARE_INCLUDE_SSOBFS=n" >> .config # simple-obfs混淆插件 - echo "CONFIG_FIRMWARE_INCLUDE_ADBYBY=y" >> .config #adbyby plus+ + echo "CONFIG_FIRMWARE_INCLUDE_ADBYBY=n" >> .config #adbyby plus+ echo "CONFIG_FIRMWARE_INCLUDE_DNSFORWARDER=n" >> .config #DNSFORWARDER echo "CONFIG_FIRMWARE_INCLUDE_SRELAY=n" >> .config #可以不集成 - echo "CONFIG_FIRMWARE_INCLUDE_XRAY=y" >> .config #集成xray执行文件 ~4.5M + echo "CONFIG_FIRMWARE_INCLUDE_XRAY=n" >> .config #集成xray执行文件 ~4.5M echo "CONFIG_FIRMWARE_INCLUDE_V2RAY=n" >> .config #集成v2ray执行文件 - echo "CONFIG_FIRMWARE_INCLUDE_DDNSTO=y" >> .config #ddnsto ~0.5M + echo "CONFIG_FIRMWARE_INCLUDE_DDNSTO=n" >> .config #ddnsto ~0.5M echo "CONFIG_FIRMWARE_INCLUDE_ALDRIVER=n" >> .config #阿里云盘 ~3m echo "CONFIG_FIRMWARE_INCLUDE_ZEROTIER=n" >> .config #zerotier ~1.3M - echo "CONFIG_FIRMWARE_INCLUDE_ALIDDNS=y" >> .config #aliddns + echo "CONFIG_FIRMWARE_INCLUDE_ALIDDNS=n" >> .config #aliddns else echo "CONFIG_FIRMWARE_INCLUDE_MENTOHUST=n" >> .config #MENTOHUST echo "CONFIG_FIRMWARE_INCLUDE_SCUTCLIENT=n" >> .config #SCUTCLIENT - echo "CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS=y" >> .config #SS plus+ + echo "CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS=n" >> .config #SS plus+ echo "CONFIG_FIRMWARE_INCLUDE_SSOBFS=n" >> .config # simple-obfs混淆插件 echo "CONFIG_FIRMWARE_INCLUDE_SSSERVER=n" >> .config #SS server echo "CONFIG_FIRMWARE_INCLUDE_DNSFORWARDER=n" >> .config #DNSFORWARDER - echo "CONFIG_FIRMWARE_INCLUDE_ADBYBY=y" >> .config #adbyby plus+ + echo "CONFIG_FIRMWARE_INCLUDE_ADBYBY=n" >> .config #adbyby plus+ echo "CONFIG_FIRMWARE_INCLUDE_FRPC=n" >> .config #内网穿透FRPC echo "CONFIG_FIRMWARE_INCLUDE_FRPS=n" >> .config #内网穿透FRPS echo "CONFIG_FIRMWARE_INCLUDE_TUNSAFE=n" >> .config #TUNSAFE - echo "CONFIG_FIRMWARE_INCLUDE_ALIDDNS=y" >> .config #阿里DDNS - echo "CONFIG_FIRMWARE_INCLUDE_SMARTDNS=y" >> .config #smartdns - echo "CONFIG_FIRMWARE_INCLUDE_SMARTDNSBIN=y" >> .config #smartdns二进制文件 + echo "CONFIG_FIRMWARE_INCLUDE_ALIDDNS=n" >> .config #阿里DDNS + echo "CONFIG_FIRMWARE_INCLUDE_SMARTDNS=n" >> .config #smartdns + echo "CONFIG_FIRMWARE_INCLUDE_SMARTDNSBIN=n" >> .config #smartdns二进制文件 echo "CONFIG_FIRMWARE_INCLUDE_V2RAY=n" >> .config #集成v2ray执行文件(3.8M左右),如果不集成,会从网上下载下来执行,不影响正常使用 echo "CONFIG_FIRMWARE_INCLUDE_TROJAN=n" >> .config #集成trojan执行文件(1.1M左右),如果不集成,会从网上下载下来执行,不影响正常使用 - echo "CONFIG_FIRMWARE_INCLUDE_KOOLPROXY=y" >> .config #KP广告过滤 - echo "CONFIG_FIRMWARE_INCLUDE_CADDY=y" >> .config #在线文件管理服务 + echo "CONFIG_FIRMWARE_INCLUDE_KOOLPROXY=n" >> .config #KP广告过滤 + echo "CONFIG_FIRMWARE_INCLUDE_CADDY=n" >> .config #在线文件管理服务 echo "CONFIG_FIRMWARE_INCLUDE_CADDYBIN=n" >> .config #集成caddu执行文件,此文件有13M,请注意固件大小。如果不集成,会从网上下载下来执行,不影响正常使用 - echo "CONFIG_FIRMWARE_INCLUDE_ADGUARDHOME=y" >> .config + echo "CONFIG_FIRMWARE_INCLUDE_ADGUARDHOME=n" >> .config echo "CONFIG_FIRMWARE_INCLUDE_SRELAY=n" >> .config #可以不集成 - echo "CONFIG_FIRMWARE_INCLUDE_WYY=y" >> .config #网易云解锁 + echo "CONFIG_FIRMWARE_INCLUDE_WYY=n" >> .config #网易云解锁 echo "CONFIG_FIRMWARE_INCLUDE_WYYBIN=n" >> .config #网易云解锁GO版本执行文件(4M多)注意固件超大小,不集成会自动下载 echo "CONFIG_FIRMWARE_INCLUDE_ZEROTIER=n" >> .config #zerotier ~1.3M fi