diff --git a/.github/workflows/Auto compile with openwrt sdk.yml b/.github/workflows/Auto compile with openwrt sdk.yml index 571ded0ee..25dca161c 100644 --- a/.github/workflows/Auto compile with openwrt sdk.yml +++ b/.github/workflows/Auto compile with openwrt sdk.yml @@ -78,13 +78,13 @@ jobs: fail-fast: false matrix: include: - - sdk_ver: 21.02 - luci_ver: 19.07 + - sdk_ver: "21.02" + luci_ver: "19.07" sdk_url: https://downloads.openwrt.org/releases/21.02.7/targets/x86/64/openwrt-sdk-21.02.7-x86-64_gcc-8.4.0_musl.Linux-x86_64.tar.xz - - sdk_ver: 23.05 - luci_ver: 23.05 - sdk_url: https://downloads.openwrt.org/releases/23.05.5/targets/x86/64/openwrt-sdk-23.05.5-x86-64_gcc-12.3.0_musl.Linux-x86_64.tar.xz + - sdk_ver: "24.10" + luci_ver: "24.10" + sdk_url: https://downloads.openwrt.org/releases/24.10.0/targets/x86/64/openwrt-sdk-24.10.0-x86-64_gcc-13.3.0_musl.Linux-x86_64.tar.zst steps: - name: Install packages run: | @@ -107,7 +107,7 @@ jobs: run: | wget ${{ matrix.sdk_url }} file_name=$(echo ${{ matrix.sdk_url }} | awk -F/ '{print $NF}') - mkdir sdk && tar -xJf $file_name -C ./sdk --strip-components=1 + mkdir sdk && tar --zstd -x -f $file_name -C ./sdk --strip-components=1 cd sdk echo "src-git base https://github.com/openwrt/openwrt.git;openwrt-${{ matrix.sdk_ver }}" > feeds.conf echo "src-git packages https://github.com/openwrt/packages.git;openwrt-${{ matrix.sdk_ver }}" >> feeds.conf @@ -172,58 +172,76 @@ jobs: matrix: include: - platform: x86_64 - url_sdk: https://downloads.openwrt.org/releases/23.05.5/targets/x86/64/openwrt-sdk-23.05.5-x86-64_gcc-12.3.0_musl.Linux-x86_64.tar.xz + url_sdk: https://downloads.openwrt.org/releases/24.10.0/targets/x86/64/openwrt-sdk-24.10.0-x86-64_gcc-13.3.0_musl.Linux-x86_64.tar.zst + sdk_ver: "24.10" - platform: aarch64_generic - url_sdk: https://downloads.openwrt.org/releases/23.05.5/targets/rockchip/armv8/openwrt-sdk-23.05.5-rockchip-armv8_gcc-12.3.0_musl.Linux-x86_64.tar.xz + url_sdk: https://downloads.openwrt.org/releases/24.10.0/targets/rockchip/armv8/openwrt-sdk-24.10.0-rockchip-armv8_gcc-13.3.0_musl.Linux-x86_64.tar.zst + sdk_ver: "24.10" - platform: aarch64_cortex-a53 - url_sdk: https://downloads.openwrt.org/releases/23.05.5/targets/mvebu/cortexa53/openwrt-sdk-23.05.5-mvebu-cortexa53_gcc-12.3.0_musl.Linux-x86_64.tar.xz + url_sdk: https://downloads.openwrt.org/releases/24.10.0/targets/mvebu/cortexa53/openwrt-sdk-24.10.0-mvebu-cortexa53_gcc-13.3.0_musl.Linux-x86_64.tar.zst + sdk_ver: "24.10" - platform: aarch64_cortex-a72 - url_sdk: https://downloads.openwrt.org/releases/23.05.5/targets/mvebu/cortexa72/openwrt-sdk-23.05.5-mvebu-cortexa72_gcc-12.3.0_musl.Linux-x86_64.tar.xz + url_sdk: https://downloads.openwrt.org/releases/24.10.0/targets/mvebu/cortexa72/openwrt-sdk-24.10.0-mvebu-cortexa72_gcc-13.3.0_musl.Linux-x86_64.tar.zst + sdk_ver: "24.10" - platform: arm_cortex-a5_vfpv4 - url_sdk: https://downloads.openwrt.org/releases/23.05.5/targets/at91/sama5/openwrt-sdk-23.05.5-at91-sama5_gcc-12.3.0_musl_eabi.Linux-x86_64.tar.xz + url_sdk: https://downloads.openwrt.org/releases/24.10.0/targets/at91/sama5/openwrt-sdk-24.10.0-at91-sama5_gcc-13.3.0_musl_eabi.Linux-x86_64.tar.zst + sdk_ver: "24.10" - platform: arm_cortex-a7 - url_sdk: https://downloads.openwrt.org/releases/23.05.5/targets/mediatek/mt7629/openwrt-sdk-23.05.5-mediatek-mt7629_gcc-12.3.0_musl_eabi.Linux-x86_64.tar.xz + url_sdk: https://downloads.openwrt.org/releases/24.10.0/targets/mediatek/mt7629/openwrt-sdk-24.10.0-mediatek-mt7629_gcc-13.3.0_musl_eabi.Linux-x86_64.tar.zst + sdk_ver: "24.10" - platform: arm_cortex-a7_neon-vfpv4 - url_sdk: https://downloads.openwrt.org/releases/23.05.5/targets/sunxi/cortexa7/openwrt-sdk-23.05.5-sunxi-cortexa7_gcc-12.3.0_musl_eabi.Linux-x86_64.tar.xz + url_sdk: https://downloads.openwrt.org/releases/24.10.0/targets/sunxi/cortexa7/openwrt-sdk-24.10.0-sunxi-cortexa7_gcc-13.3.0_musl_eabi.Linux-x86_64.tar.zst + sdk_ver: "24.10" - platform: arm_cortex-a8_vfpv3 - url_sdk: https://downloads.openwrt.org/releases/23.05.5/targets/sunxi/cortexa8/openwrt-sdk-23.05.5-sunxi-cortexa8_gcc-12.3.0_musl_eabi.Linux-x86_64.tar.xz + url_sdk: https://downloads.openwrt.org/releases/24.10.0/targets/sunxi/cortexa8/openwrt-sdk-24.10.0-sunxi-cortexa8_gcc-13.3.0_musl_eabi.Linux-x86_64.tar.zst + sdk_ver: "24.10" - platform: arm_cortex-a9 - url_sdk: https://downloads.openwrt.org/releases/23.05.5/targets/bcm53xx/generic/openwrt-sdk-23.05.5-bcm53xx-generic_gcc-12.3.0_musl_eabi.Linux-x86_64.tar.xz + url_sdk: https://downloads.openwrt.org/releases/24.10.0/targets/bcm53xx/generic/openwrt-sdk-24.10.0-bcm53xx-generic_gcc-13.3.0_musl_eabi.Linux-x86_64.tar.zst + sdk_ver: "24.10" - platform: arm_cortex-a9_neon - url_sdk: https://downloads.openwrt.org/releases/23.05.5/targets/zynq/generic/openwrt-sdk-23.05.5-zynq-generic_gcc-12.3.0_musl_eabi.Linux-x86_64.tar.xz + url_sdk: https://downloads.openwrt.org/releases/24.10.0/targets/zynq/generic/openwrt-sdk-24.10.0-zynq-generic_gcc-13.3.0_musl_eabi.Linux-x86_64.tar.zst + sdk_ver: "24.10" - platform: arm_cortex-a9_vfpv3-d16 - url_sdk: https://downloads.openwrt.org/releases/23.05.5/targets/mvebu/cortexa9/openwrt-sdk-23.05.5-mvebu-cortexa9_gcc-12.3.0_musl_eabi.Linux-x86_64.tar.xz + url_sdk: https://downloads.openwrt.org/releases/24.10.0/targets/mvebu/cortexa9/openwrt-sdk-24.10.0-mvebu-cortexa9_gcc-13.3.0_musl_eabi.Linux-x86_64.tar.zst + sdk_ver: "24.10" - platform: arm_cortex-a15_neon-vfpv4 - url_sdk: https://downloads.openwrt.org/releases/23.05.5/targets/ipq806x/generic/openwrt-sdk-23.05.5-ipq806x-generic_gcc-12.3.0_musl_eabi.Linux-x86_64.tar.xz + url_sdk: https://downloads.openwrt.org/releases/24.10.0/targets/ipq806x/generic/openwrt-sdk-24.10.0-ipq806x-generic_gcc-13.3.0_musl_eabi.Linux-x86_64.tar.zst + sdk_ver: "24.10" - platform: mips_24kc - url_sdk: https://downloads.openwrt.org/releases/23.05.5/targets/ath79/generic/openwrt-sdk-23.05.5-ath79-generic_gcc-12.3.0_musl.Linux-x86_64.tar.xz + url_sdk: https://downloads.openwrt.org/releases/24.10.0/targets/ath79/generic/openwrt-sdk-24.10.0-ath79-generic_gcc-13.3.0_musl.Linux-x86_64.tar.zst + sdk_ver: "24.10" - platform: mips_4kec - url_sdk: https://downloads.openwrt.org/releases/23.05.5/targets/realtek/rtl838x/openwrt-sdk-23.05.5-realtek-rtl838x_gcc-12.3.0_musl.Linux-x86_64.tar.xz + url_sdk: https://downloads.openwrt.org/releases/24.10.0/targets/realtek/rtl838x/openwrt-sdk-24.10.0-realtek-rtl838x_gcc-13.3.0_musl.Linux-x86_64.tar.zst + sdk_ver: "24.10" - platform: mips_mips32 - url_sdk: https://downloads.openwrt.org/releases/23.05.5/targets/bcm63xx/generic/openwrt-sdk-23.05.5-bcm63xx-generic_gcc-12.3.0_musl.Linux-x86_64.tar.xz + url_sdk: https://downloads.openwrt.org/releases/24.10.0/targets/bcm53xx/generic/openwrt-sdk-24.10.0-bcm53xx-generic_gcc-13.3.0_musl_eabi.Linux-x86_64.tar.zst + sdk_ver: "24.10" - platform: mipsel_24kc - url_sdk: https://downloads.openwrt.org/releases/23.05.5/targets/ramips/rt288x/openwrt-sdk-23.05.5-ramips-rt288x_gcc-12.3.0_musl.Linux-x86_64.tar.xz + url_sdk: https://downloads.openwrt.org/releases/24.10.0/targets/ramips/rt288x/openwrt-sdk-24.10.0-ramips-rt288x_gcc-13.3.0_musl.Linux-x86_64.tar.zst + sdk_ver: "24.10" - platform: mipsel_74kc - url_sdk: https://downloads.openwrt.org/releases/23.05.5/targets/ramips/rt3883/openwrt-sdk-23.05.5-ramips-rt3883_gcc-12.3.0_musl.Linux-x86_64.tar.xz + url_sdk: https://downloads.openwrt.org/releases/24.10.0/targets/ramips/rt3883/openwrt-sdk-24.10.0-ramips-rt3883_gcc-13.3.0_musl.Linux-x86_64.tar.zst + sdk_ver: "24.10" - platform: mipsel_mips32 - url_sdk: https://downloads.openwrt.org/releases/23.05.5/targets/bcm47xx/generic/openwrt-sdk-23.05.5-bcm47xx-generic_gcc-12.3.0_musl.Linux-x86_64.tar.xz + url_sdk: https://downloads.openwrt.org/releases/24.10.0/targets/bcm47xx/generic/openwrt-sdk-24.10.0-bcm47xx-generic_gcc-13.3.0_musl.Linux-x86_64.tar.zst + sdk_ver: "24.10" steps: - name: Initialization ${{ matrix.platform }} compile environment @@ -239,7 +257,7 @@ jobs: run: | wget ${{ matrix.url_sdk }} file_name=$(echo ${{matrix.url_sdk}} | awk -F/ '{print $NF}') - mkdir sdk && tar -xJf $file_name -C ./sdk --strip-components=1 + mkdir sdk && tar --zstd -x -f $file_name -C ./sdk --strip-components=1 cd sdk - name: SSH connection to Actions @@ -249,10 +267,10 @@ jobs: - name: ${{ matrix.platform }} feeds configuration packages run: | cd sdk - echo "src-git base https://github.com/openwrt/openwrt.git;openwrt-23.05" > feeds.conf - echo "src-git packages https://github.com/openwrt/packages.git;openwrt-23.05" >> feeds.conf - echo "src-git luci https://github.com/openwrt/luci.git;openwrt-23.05" >> feeds.conf - echo "src-git routing https://git.openwrt.org/feed/routing.git;openwrt-23.05" >> feeds.conf + echo "src-git base https://github.com/openwrt/openwrt.git;openwrt-${{ matrix.sdk_ver }}" > feeds.conf + echo "src-git packages https://github.com/openwrt/packages.git;openwrt-${{ matrix.sdk_ver }}" >> feeds.conf + echo "src-git luci https://github.com/openwrt/luci.git;openwrt-${{ matrix.sdk_ver }}" >> feeds.conf + echo "src-git routing https://git.openwrt.org/feed/routing.git;openwrt-${{ matrix.sdk_ver }}" >> feeds.conf echo "src-git passwall_packages https://github.com/${{ env.packages }}.git;main" >> feeds.conf echo "src-git passwall2 https://github.com/${{ env.passwall2 }}.git;main" >> feeds.conf @@ -299,20 +317,15 @@ jobs: id: compile run: | cd sdk - make package/feeds/passwall_packages/chinadns-ng/compile -j1 V=s 2>/dev/null - make package/feeds/passwall_packages/geoview/compile -j1 V=s 2>/dev/null - make package/feeds/passwall_packages/tcping/compile -j1 V=s 2>/dev/null - make package/feeds/passwall_packages/xray-core/compile -j1 V=s 2>/dev/null - make package/feeds/passwall_packages/v2ray-geodata/compile -j1 V=s 2>/dev/null - - make package/feeds/passwall_packages/hysteria/compile -j1 V=s 2>/dev/null - make package/feeds/passwall_packages/naiveproxy/compile -j1 V=s 2>/dev/null - make package/feeds/passwall_packages/shadowsocks-rust/compile -j1 V=s 2>/dev/null - make package/feeds/passwall_packages/shadowsocksr-libev/compile -j1 V=s 2>/dev/null - make package/feeds/passwall_packages/simple-obfs/compile -j1 V=s 2>/dev/null - make package/feeds/passwall_packages/sing-box/compile -j1 V=s 2>/dev/null - make package/feeds/passwall_packages/tuic-client/compile -j1 V=s 2>/dev/null - make package/feeds/passwall_packages/v2ray-plugin/compile -j1 V=s 2>/dev/null + for package in $(ls feeds/passwall_packages); do + if [ -d "feeds/passwall_packages/$package" ]; then + echo "-----------begin compile $package ---------------" + sleep 10s + make package/feeds/passwall_packages/$package/compile -j$(nproc) V=s + echo "-----------compiled $package ---------------" + echo "" + fi + done echo "status=success" >> $GITHUB_OUTPUT