diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1607e468c..06bededf2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,9 +1,10 @@ name: build on: - workflow_dispatch: - schedule: - - cron: '0 0 * * *' # Run nightly + # workflow_dispatch: + # schedule: + # - cron: '0 0 * * *' # Run nightly + push: jobs: check: @@ -60,46 +61,50 @@ jobs: strategy: fail-fast: false matrix: - branch: [openwrt-19.07, openwrt-21.02, openwrt-22.03, openwrt-23.05] + branch: + # - openwrt-19.07 + # - openwrt-21.02 + # - openwrt-22.03 + - openwrt-23.05 arch: - - aarch64_cortex-a53 - - aarch64_cortex-a72 - - aarch64_generic - - arm_arm1176jzf-s_vfp - - arm_arm926ej-s - - arm_cortex-a15_neon-vfpv4 - - arm_cortex-a5_vfpv4 - - arm_cortex-a7 - - arm_cortex-a7_neon-vfpv4 - - arm_cortex-a7_vfpv4 - - arm_cortex-a8_vfpv3 - - arm_cortex-a9 - - arm_cortex-a9_neon - - arm_cortex-a9_vfpv3-d16 - - arm_fa526 - - arm_mpcore - - arm_xscale - - mips64_octeonplus - - mips_24kc - - mips_4kec - - mips_mips32 - - mipsel_24kc - - mipsel_24kc_24kf - - mipsel_74kc - - mipsel_mips32 + # - aarch64_cortex-a53 + # - aarch64_cortex-a72 + # - aarch64_generic + # - arm_arm1176jzf-s_vfp + # - arm_arm926ej-s + # - arm_cortex-a15_neon-vfpv4 + # - arm_cortex-a5_vfpv4 + # - arm_cortex-a7 + # - arm_cortex-a7_neon-vfpv4 + # - arm_cortex-a7_vfpv4 + # - arm_cortex-a8_vfpv3 + # - arm_cortex-a9 + # - arm_cortex-a9_neon + # - arm_cortex-a9_vfpv3-d16 + # - arm_fa526 + # - arm_mpcore + # - arm_xscale + # - mips64_octeonplus + # - mips_24kc + # - mips_4kec + # - mips_mips32 + # - mipsel_24kc + # - mipsel_24kc_24kf + # - mipsel_74kc + # - mipsel_mips32 - x86_64 - include: - - branch: SNAPSHOT - arch: x86_64 - exclude: - - branch: openwrt-19.07 - arch: arm_cortex-a7 - - branch: openwrt-19.07 - arch: arm_cortex-a7_vfpv4 - - branch: openwrt-19.07 - arch: mips_4kec - - branch: openwrt-21.02 - arch: arm_cortex-a7_vfpv4 + # include: + # - branch: SNAPSHOT + # arch: x86_64 + # exclude: + # - branch: openwrt-19.07 + # arch: arm_cortex-a7 + # - branch: openwrt-19.07 + # arch: arm_cortex-a7_vfpv4 + # - branch: openwrt-19.07 + # arch: mips_4kec + # - branch: openwrt-21.02 + # arch: arm_cortex-a7_vfpv4 container: image: openwrt/sdk:${{ matrix.arch }}-${{ matrix.branch }} options: --user root @@ -119,7 +124,16 @@ jobs: xargs -I{} wget -qO- https://github.com/cli/cli/releases/download/v{}/gh_{}_linux_amd64.tar.gz | tar -xz --wildcards '*/bin/gh' --strip-components=2 cd zapret && ../gh pr diff 413 | git apply - - - name: Setup ccache + - name: Set up SDK + if: ${{ matrix.branch == 'openwrt-23.05' }} + working-directory: /builder + run: | + gpg --verbose --recv-keys 0x1D53D1877742E911 + sed -r -i 's/^rm.+//' setup.sh + ./setup.sh + ls -lhR + + - name: Set up ccache uses: actions/cache@v4 with: path: ${{ matrix.branch == 'openwrt-19.07' && '/home/build/openwrt/.ccache' || '/builder/.ccache' }} @@ -129,7 +143,7 @@ jobs: - name: Build packages id: build - continue-on-error: true + # continue-on-error: true working-directory: ${{ matrix.branch == 'openwrt-19.07' && '/home/build/openwrt' || '/builder' }} env: DATE: ${{ needs.check.outputs.date }} @@ -142,11 +156,11 @@ jobs: run: | export PKG_VERSION=$(date --utc -d $DATE +%Y%m%d) - find $GITHUB_WORKSPACE/zapret -type d -path '*/package/zapret' -exec cp -r {} ./package \; - cp -r $GITHUB_WORKSPACE/zapret/tpws ./package/zapret/tpws/ - cp -r $GITHUB_WORKSPACE/zapret/nfq ./package/zapret/nfqws/ - cp -r $GITHUB_WORKSPACE/zapret/mdig ./package/zapret/mdig/ - cp -r $GITHUB_WORKSPACE/zapret/ip2net ./package/zapret/ip2net/ + find $GITHUB_WORKSPACE/zapret -type d -path '*/package/zapret' -exec cp -vr {} ./package \; + cp -vr $GITHUB_WORKSPACE/zapret/tpws ./package/zapret/tpws/ + cp -vr $GITHUB_WORKSPACE/zapret/nfq ./package/zapret/nfqws/ + cp -vr $GITHUB_WORKSPACE/zapret/mdig ./package/zapret/mdig/ + cp -vr $GITHUB_WORKSPACE/zapret/ip2net ./package/zapret/ip2net/ # find ./package/zapret -type f -name Makefile -exec sed 's/PKG_RELEASE.*//g' -i {} \; mv feeds.conf.default feeds.conf @@ -190,6 +204,7 @@ jobs: path: ./**/logs-*.tar.xz gh-pages: + if: false needs: [check, build] permissions: contents: write @@ -219,6 +234,7 @@ jobs: continue-on-error: true release: + if: false needs: [check, gh-pages] permissions: contents: write