diff --git a/.github/workflows/X-x86_64_X.yml b/.github/workflows/X-x86_64_X.yml index 80daa83..4549a2c 100644 --- a/.github/workflows/X-x86_64_X.yml +++ b/.github/workflows/X-x86_64_X.yml @@ -216,9 +216,38 @@ jobs: rm package/feeds/packages/adguardhome -rf rm feeds/packages/net/adguardhome -rf ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome - make -j4 || make -j1 V=s + make -j4 | tee ./build_log.log || make -j1 V=s [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV + + + - name: Check Build Update + run: | + export NOW_DATA_VERSION=${{env.NOW_DATA_VERSION}} + export GITHUB_WORKSPACE=$GITHUB_WORKSPACE + bash $GITHUB_WORKSPACE/Scripts/AutoBuild_Upcheck.sh ${{env.Tempoary_FLAG}} + + - name: Upload Package Version to Github Release + uses: svenstaro/upload-release-action@v2 + if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled() + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ${{env.Tempoary_FLAG}}_build_pkg_ver.log + file_glob: true + tag: v${{ steps.date.outputs.date }} + overwrite: true + + - name: Upload Package Update to Github Release + uses: svenstaro/upload-release-action@v2 + if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled() + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ${{env.Tempoary_FLAG}}_build_pkg_up.log + file_glob: true + tag: v${{ steps.date.outputs.date }} + overwrite: true + + - name: Process Firmware if: env.Result == 'true' && !cancelled() run: | diff --git a/.github/workflows/X-x86_64_Y.yml b/.github/workflows/X-x86_64_Y.yml index 9e196c2..062d4dc 100644 --- a/.github/workflows/X-x86_64_Y.yml +++ b/.github/workflows/X-x86_64_Y.yml @@ -213,9 +213,36 @@ jobs: rm package/feeds/packages/adguardhome -rf rm feeds/packages/net/adguardhome -rf ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome - make -j4 || make -j1 V=s + make -j4 | tee ./build_log.log || make -j1 V=s [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV + + - name: Check Build Update + run: | + export NOW_DATA_VERSION=${{env.NOW_DATA_VERSION}} + export GITHUB_WORKSPACE=$GITHUB_WORKSPACE + bash $GITHUB_WORKSPACE/Scripts/AutoBuild_Upcheck.sh ${{env.Tempoary_FLAG}} + + - name: Upload Package Version to Github Release + uses: svenstaro/upload-release-action@v2 + if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled() + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ${{env.Tempoary_FLAG}}_build_pkg_ver.log + file_glob: true + tag: v${{ steps.date.outputs.date }} + overwrite: true + + - name: Upload Package Update to Github Release + uses: svenstaro/upload-release-action@v2 + if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled() + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ${{env.Tempoary_FLAG}}_build_pkg_up.log + file_glob: true + tag: v${{ steps.date.outputs.date }} + overwrite: true + - name: Process Firmware if: env.Result == 'true' && !cancelled() run: | diff --git a/Configs/x86_64-Z b/Configs/x86_64-Z index 814128f..372849d 100644 --- a/Configs/x86_64-Z +++ b/Configs/x86_64-Z @@ -25,8 +25,16 @@ CONFIG_PACKAGE_adguardhome=y # Dnsmasq 及IPV6,AutoUpdate CONFIG_PACKAGE_dnsmasq-full=y CONFIG_PACKAGE_dnsmasq_full_dhcp=y -CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y CONFIG_PACKAGE_luci-app-autoupdate=y +# IPv6 支持 +CONFIG_IPV6=y +CONFIG_KERNEL_IPV6=y +CONFIG_PACKAGE_ipv6helper=y +CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y +CONFIG_PACKAGE_6in4=y +CONFIG_PACKAGE_6rd=y +CONFIG_PACKAGE_6to4=y + # Netdata CONFIG_PACKAGE_luci-app-netdata=y # Diskman