diff --git a/.github/workflows/AutoBuild-asus_rt-acrh17.yml b/.github/workflows/AutoBuild-asus_rt-acrh17.yml index 2d3a8b5..fcb5b3e 100644 --- a/.github/workflows/AutoBuild-asus_rt-acrh17.yml +++ b/.github/workflows/AutoBuild-asus_rt-acrh17.yml @@ -157,7 +157,7 @@ jobs: cd openwrt if [ "${{ env.CACHE_ACCELERATE }}" == true ] then - echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE + echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE fi cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh diff --git a/.github/workflows/AutoBuild-d-team_newifi-d2.yml b/.github/workflows/AutoBuild-d-team_newifi-d2.yml index 79d2234..e10e540 100644 --- a/.github/workflows/AutoBuild-d-team_newifi-d2.yml +++ b/.github/workflows/AutoBuild-d-team_newifi-d2.yml @@ -157,7 +157,7 @@ jobs: cd openwrt if [ "${{ env.CACHE_ACCELERATE }}" == true ] then - echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE + echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE fi cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh diff --git a/.github/workflows/AutoBuild-p2w_r619ac-128m.yml b/.github/workflows/AutoBuild-p2w_r619ac-128m.yml index b08b0cc..a77d28b 100644 --- a/.github/workflows/AutoBuild-p2w_r619ac-128m.yml +++ b/.github/workflows/AutoBuild-p2w_r619ac-128m.yml @@ -157,7 +157,7 @@ jobs: cd openwrt if [ "${{ env.CACHE_ACCELERATE }}" == true ] then - echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE + echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE fi cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh diff --git a/.github/workflows/AutoBuild-x86_64.yml b/.github/workflows/AutoBuild-x86_64.yml index 39b7080..fed549f 100644 --- a/.github/workflows/AutoBuild-x86_64.yml +++ b/.github/workflows/AutoBuild-x86_64.yml @@ -156,7 +156,7 @@ jobs: cd openwrt if [ "${{ env.CACHE_ACCELERATE }}" == true ] then - echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE + echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE fi cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh diff --git a/.github/workflows/AutoBuild-xiaomi_mi-router-4a-gigabit.yml b/.github/workflows/AutoBuild-xiaomi_mi-router-4a-gigabit.yml index 3e42c75..162142b 100644 --- a/.github/workflows/AutoBuild-xiaomi_mi-router-4a-gigabit.yml +++ b/.github/workflows/AutoBuild-xiaomi_mi-router-4a-gigabit.yml @@ -157,7 +157,7 @@ jobs: cd openwrt if [ "${{ env.CACHE_ACCELERATE }}" == true ] then - echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE + echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE fi cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh diff --git a/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml b/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml index 2ed39f8..b2929a0 100644 --- a/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml +++ b/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml @@ -157,7 +157,7 @@ jobs: cd openwrt if [ "${{ env.CACHE_ACCELERATE }}" == true ] then - echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE + echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE fi cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh diff --git a/.github/workflows/AutoBuild-xiaomi_redmi-router-ax6s.yml b/.github/workflows/AutoBuild-xiaomi_redmi-router-ax6s.yml index 747b8f4..68fdb49 100644 --- a/.github/workflows/AutoBuild-xiaomi_redmi-router-ax6s.yml +++ b/.github/workflows/AutoBuild-xiaomi_redmi-router-ax6s.yml @@ -157,7 +157,7 @@ jobs: cd openwrt if [ "${{ env.CACHE_ACCELERATE }}" == true ] then - echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE + echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE fi cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh diff --git a/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml b/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml index 8afa7f2..2728c81 100644 --- a/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml +++ b/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml @@ -157,7 +157,7 @@ jobs: cd openwrt if [ "${{ env.CACHE_ACCELERATE }}" == true ] then - echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE + echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE fi cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh diff --git a/.github/workflows/X-x86_64_Test.yml b/.github/workflows/X-x86_64_Test.yml index eef3416..8d6242a 100644 --- a/.github/workflows/X-x86_64_Test.yml +++ b/.github/workflows/X-x86_64_Test.yml @@ -172,7 +172,7 @@ jobs: cd openwrt if [ "${{ env.CACHE_ACCELERATE }}" == true ] then - echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE + echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE fi cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh diff --git a/.github/workflows/X-x86_64_X.yml b/.github/workflows/X-x86_64_X.yml index ca3ba9c..194a820 100644 --- a/.github/workflows/X-x86_64_X.yml +++ b/.github/workflows/X-x86_64_X.yml @@ -191,7 +191,7 @@ jobs: cd openwrt if [ "${{ env.CACHE_ACCELERATE }}" == true ] then - echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE + echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE fi cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh diff --git a/.github/workflows/X-x86_64_X_Mine.yml b/.github/workflows/X-x86_64_X_Mine.yml index cdf14c2..50e713a 100644 --- a/.github/workflows/X-x86_64_X_Mine.yml +++ b/.github/workflows/X-x86_64_X_Mine.yml @@ -180,7 +180,7 @@ jobs: cd openwrt if [ "${{ env.CACHE_ACCELERATE }}" == true ] then - echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE + echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE fi cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh diff --git a/.github/workflows/X-x86_64_X_Mine_Test.yml b/.github/workflows/X-x86_64_X_Mine_Test.yml deleted file mode 100644 index bd3ab5d..0000000 --- a/.github/workflows/X-x86_64_X_Mine_Test.yml +++ /dev/null @@ -1,419 +0,0 @@ -########################################################### -# Description: Compile OpenWrt by GitHub Actions # -# Based on: https://github.com/P3TERX/Actions-OpenWrt # -# Author: Xinb # -########################################################### - -name: x86_64_X_Mine_Test - -### 以下内容请保持不变 (请修改下方的 环境变量设置) -on: - repository_dispatch: - workflow_dispatch: - inputs: - Release: - description: '是否上传到Github' - default: 'true' - SharePoint: - description: '是否上传到SharePoint' - default: 'true' - Tempoary_IP: - description: '固件 IP 地址 [可选]' - default: '192.168.2.200' - Tempoary_CONFIG: - description: '配置文件 [可选]' - default: 'x86_64-X' - Tempoary_FLAG: - description: '固件名称后缀 [可选]' - default: 'X' -### 结束 - - #push: - # branches: - # - master - - #schedule: - # - cron: 0 8 * * 5 - - #watch: - # types: [started] - -### 环境变量设置 -env: -# 编译时调用的 [.config] 文件名称 - CONFIG_FILE: x86_64-X -# 源码仓库:分支 - DEFAULT_SOURCE: coolsnowwolf/lede:master -# 上传固件到 Github Releases - UPLOAD_RELEASES: true -# 上传固件到 Github Artifacts - UPLOAD_ARTIFACTS: false -# 上传 bin 文件夹到 Github Artifacts - UPLOAD_BIN_ARTIFACTS: false -# 删除无用文件以增加编译空间 - DELETE_USELESS_FILES: false -# 删除早期的 workflow 任务 - DELETE_OLD_WORKFLOW: true -# Cache 加速编译 - CACHE_ACCELERATE: true -### 结束 - -jobs: - Compile: - runs-on: self-hosted - steps: - - # - name: Checkout - # uses: actions/checkout@main - # with: - # fetch-depth: 0 - - - name: Set env & Echo System Info - id: date - run: | - echo "::set-output name=date::$(date +'%Y-%m-%d')" - echo "Release=${{ github.event.inputs.Release }}" >> $GITHUB_ENV - echo "SharePoint=${{ github.event.inputs.SharePoint }}" >> $GITHUB_ENV - echo "data2=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT - echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV - - export NOW_DATA_VERSION=${{env.NOW_DATA_VERSION}} - export GITHUB_WORKSPACE=$GITHUB_WORKSPACE - - chmod +x $GITHUB_WORKSPACE/Scripts/AutoBuild_*.sh - source $GITHUB_WORKSPACE/Scripts/AutoBuild_Getenv.sh - - if [ "${{ env.DELETE_USELESS_FILES }}" == true ] - then - docker rmi node:18 node:20 node:22 node:18-alpine node:20-alpine node:22-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest ubuntu:20.04 debian:10 debian:11 - sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php - sudo -E apt-get -y autoremove --purge - sudo -E apt-get clean - fi - Get_Action_Info - - - - - - - name: Load Custom Variables - run: | - echo "Free space:" - df -h - if [ -n "${{ github.event.inputs.Tempoary_CONFIG }}" ] - then - if [ -f "$GITHUB_WORKSPACE/Configs/${{ github.event.inputs.Tempoary_CONFIG }}" ] - then - CONFIG_FILE=${{ github.event.inputs.Tempoary_CONFIG }} - else - CONFIG_FILE=${{ env.CONFIG_FILE }} - fi - else - CONFIG_FILE=${{ env.CONFIG_FILE }} - fi - if [ ! -f "$GITHUB_WORKSPACE/Configs/$CONFIG_FILE" ] - then - echo "CONFIG_FILE: [/Config/$CONFIG_FILE] is not detected ..." - exit 1 - else - echo "CONFIG_FILE: [/Config/$CONFIG_FILE]" - echo "CONFIG_FILE=$CONFIG_FILE" >> $GITHUB_ENV - fi - if [ -n "${{ github.event.inputs.Tempoary_IP }}" ] - then - echo "IP: [${{ github.event.inputs.Tempoary_IP }}]" - echo "Tempoary_IP=${{ github.event.inputs.Tempoary_IP }}" >> $GITHUB_ENV - fi - if [ -n "${{ github.event.inputs.Tempoary_FLAG }}" ] - then - echo "FLAG: [${{ github.event.inputs.Tempoary_FLAG }}]" - echo "Tempoary_FLAG=${{ github.event.inputs.Tempoary_FLAG }}" >> $GITHUB_ENV - fi - REPO_URL="https://github.com/$(cut -d \: -f 1 <<< ${{ env.DEFAULT_SOURCE }})" - REPO_BRANCH=$(cut -d \: -f 2 <<< ${{ env.DEFAULT_SOURCE }}) - echo "REPO_URL=$REPO_URL" >> $GITHUB_ENV - echo "REPO_BRANCH=$REPO_BRANCH" >> $GITHUB_ENV - echo "Compile_Date=$(date +%Y%m%d%H%M)" >> $GITHUB_ENV - echo "Display_Date=$(date +%Y/%m/%d)" >> $GITHUB_ENV - - - name: Initialization Environment - env: - DEBIAN_FRONTEND: noninteractive - run: | - sudo -E apt-get update - sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync - sudo -E apt-get -y install llvm clang - sudo timedatectl set-timezone "Asia/Shanghai" - sudo mkdir -p /workdir -# sudo chown $USER:$GROUPS /workdir - - - name: Clone Openwrt Source Code - run: | - # git clone -b $REPO_BRANCH $REPO_URL openwrt - ln -sf /workdir/openwrt $GITHUB_WORKSPACE/openwrt - - - name: Accelerate - if: env.CACHE_ACCELERATE == 'true' - uses: klever1988/cachewrtbuild@main - with: - ccache: false - toolchain: true - skip: true - clean: false - prefix: ${{ github.workspace }}/openwrt - - - name: Feeds install - run: | - cd openwrt - ./scripts/feeds update -a - ./scripts/feeds install -a - ./scripts/feeds uninstall luci-theme-argon - # Update golang to 1.22 for xray-core build - rm -rf feeds/packages/lang/golang - git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang -# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile -#fix dockerd bug - - - name: Run Diy Scripts - run: | - chmod +x Scripts/AutoBuild_*.sh - cd openwrt - if [ "${{ env.CACHE_ACCELERATE }}" == true ] - then - echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE - fi - cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config - source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh - source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh - make defconfig - Firmware_Diy_Before - rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config - Firmware_Diy_Main - Firmware_Diy - Firmware_Diy_Other - - - name: Pre-download Libraries - run: | - cd openwrt - ./scripts/feeds install -a - make defconfig - make download -j16 - - - name: Build OpenWrt - run: | - cd openwrt - rm package/feeds/packages/adguardhome -rf - rm feeds/packages/net/adguardhome -rf - ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome - # 2024.03.03 mosdns build fail by golang 1.22 - sed -i 's/CGO_ENABLED=0/CGO_ENABLED=1/g' feeds/packages/net/mosdns/Makefile - # make -j$(($(nproc) + 1)) | tee ./build_log.log || make -j1 V=s - make -j$(($(nproc) + 1)) || 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: | - cd openwrt - source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh - Firmware_Diy_End - - - name: Upload Firmware to Artifacts - uses: actions/upload-artifact@main - if: env.UPLOAD_ARTIFACTS == 'true' && env.Result == 'true' && !cancelled() - with: - name: ${{ env.CONFIG_FILE }}_firmware_${{ env.Compile_Date }} - path: openwrt/bin/Firmware - - - name: Upload bin to Artifacts - uses: actions/upload-artifact@main - if: env.UPLOAD_BIN_ARTIFACTS == 'true' && env.Result == 'true' && !cancelled() - with: - name: ${{ env.CONFIG_FILE }}_bin_${{ env.Compile_Date }} - path: openwrt/bin - - - name: Download Github Release API - if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled() - run: | - wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API - SP_UEFI_IMG_GZ=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.img.gz - SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ) - SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/} - SP_UEFI_VMDK=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.vmdk - SP_UEFI_VMDK=$(echo $SP_UEFI_VMDK) - SP_UEFI_VMDK=${SP_UEFI_VMDK##*/} - SP_UEFI_VDI=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.vdi - SP_UEFI_VDI=$(echo $SP_UEFI_VDI) - SP_UEFI_VDI=${SP_UEFI_VDI##*/} - SP_UEFI_VHDX=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.vhdx - SP_UEFI_VHDX=$(echo $SP_UEFI_VHDX) - SP_UEFI_VHDX=${SP_UEFI_VHDX##*/} - SP_LEGACY_IMG_GZ=openwrt/bin/Firmware/AutoBuild-*-BIOS-*.img.gz - SP_LEGACY_IMG_GZ=$(echo $SP_LEGACY_IMG_GZ) - SP_LEGACY_IMG_GZ=${SP_LEGACY_IMG_GZ##*/} - SP_LEGACY_VMDK=openwrt/bin/Firmware/AutoBuild-*-BIOS-*.vmdk - SP_LEGACY_VMDK=$(echo $SP_LEGACY_VMDK) - SP_LEGACY_VMDK=${SP_LEGACY_VMDK##*/} - SP_LEGACY_VDI=openwrt/bin/Firmware/AutoBuild-*-BIOS-*.vdi - SP_LEGACY_VDI=$(echo $SP_LEGACY_VDI) - SP_LEGACY_VDI=${SP_LEGACY_VDI##*/} - SP_LEGACY_VHDX=openwrt/bin/Firmware/AutoBuild-*-BIOS-*.vhdx - SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) - SP_LEGACY_VHDX=${SP_LEGACY_VHDX##*/} - echo SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ) >> $GITHUB_ENV - echo SP_UEFI_VMDK=$(echo $SP_UEFI_VMDK) >> $GITHUB_ENV - echo SP_UEFI_VDI=$(echo $SP_UEFI_VDI) >> $GITHUB_ENV - echo SP_UEFI_VHDX=$(echo $SP_UEFI_VHDX) >> $GITHUB_ENV - echo SP_LEGACY_IMG_GZ=$(echo $SP_LEGACY_IMG_GZ) >> $GITHUB_ENV - echo SP_LEGACY_VMDK=$(echo $SP_LEGACY_VMDK) >> $GITHUB_ENV - echo SP_LEGACY_VDI=$(echo $SP_LEGACY_VDI) >> $GITHUB_ENV - echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV - - - name: 1 Upload SP_UEFI_IMG_GZ to SharePoint - uses: su-dont/share-point-uploader@v2.1 - if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' - with: - sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt - sp_username: ${{ secrets.USERNAME }} - sp_password: ${{ secrets.PASSWORD }} - sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} - sp_file_name: ${{ env.SP_UEFI_IMG_GZ }} - file: openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }} - - - name: 2 Upload SP_UEFI_VMDK to SharePoint - uses: su-dont/share-point-uploader@v2.1 - if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' - with: - sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt - sp_username: ${{ secrets.USERNAME }} - sp_password: ${{ secrets.PASSWORD }} - sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} - sp_file_name: ${{ env.SP_UEFI_VMDK }} - file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }} - - # - name: 3 Upload SP_UEFI_VDI to SharePoint - # uses: su-dont/share-point-uploader@v2.1 - # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' - # with: - # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt - # sp_username: ${{ secrets.USERNAME }} - # sp_password: ${{ secrets.PASSWORD }} - # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} - # sp_file_name: ${{ env.SP_UEFI_VDI }} - # file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }} - - # - name: 4 Upload SP_UEFI_VHDX to SharePoint - # uses: su-dont/share-point-uploader@v2.1 - # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' - # with: - # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt - # sp_username: ${{ secrets.USERNAME }} - # sp_password: ${{ secrets.PASSWORD }} - # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} - # sp_file_name: ${{ env.SP_UEFI_VHDX }} - # file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }} - - - name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint - uses: su-dont/share-point-uploader@v2.1 - if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' - with: - sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt - sp_username: ${{ secrets.USERNAME }} - sp_password: ${{ secrets.PASSWORD }} - sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} - sp_file_name: ${{ env.SP_LEGACY_IMG_GZ }} - file: openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }} - - - name: 6 Upload SP_LEGACY_VMDK to SharePoint - uses: su-dont/share-point-uploader@v2.1 - if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' - with: - sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt - sp_username: ${{ secrets.USERNAME }} - sp_password: ${{ secrets.PASSWORD }} - sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} - sp_file_name: ${{ env.SP_LEGACY_VMDK }} - file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }} - - # - name: 7 Upload SP_LEGACY_VDI to SharePoint - # uses: su-dont/share-point-uploader@v2.1 - # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' - # with: - # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt - # sp_username: ${{ secrets.USERNAME }} - # sp_password: ${{ secrets.PASSWORD }} - # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} - # sp_file_name: ${{ env.SP_LEGACY_VDI }} - # file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }} - - # - name: 8 Upload SP_LEGACY_VHDX to SharePoint - # uses: su-dont/share-point-uploader@v2.1 - # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' - # with: - # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt - # sp_username: ${{ secrets.USERNAME }} - # sp_password: ${{ secrets.PASSWORD }} - # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} - # sp_file_name: ${{ env.SP_LEGACY_VHDX }} - # file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VHDX }} - - - name: Delete VM Disk File - if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled() - run: | - rm openwrt/bin/Firmware/AutoBuild-*.v* -rf - - - name: Upload Firmware 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: openwrt/bin/Firmware/* - file_glob: true - tag: AutoUpdate - overwrite: true - - - name: Upload API to Github Release - if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled() - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ./API - file_glob: true - tag: AutoUpdate - overwrite: true - - - name: Delete old Workflow Runs - uses: GitRML/delete-workflow-runs@main - if: env.DELETE_OLD_WORKFLOW == 'true' && !cancelled() - with: - retain_days: 1 - keep_minimum_runs: 3 diff --git a/.github/workflows/X-x86_64_Y.yml b/.github/workflows/X-x86_64_Y.yml index a553173..ac7f52f 100644 --- a/.github/workflows/X-x86_64_Y.yml +++ b/.github/workflows/X-x86_64_Y.yml @@ -188,7 +188,7 @@ jobs: cd openwrt if [ "${{ env.CACHE_ACCELERATE }}" == true ] then - echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE + echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE fi cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh diff --git a/.github/workflows/X-x86_64_Z.yml b/.github/workflows/X-x86_64_Z.yml index 6ceaed7..33461fa 100644 --- a/.github/workflows/X-x86_64_Z.yml +++ b/.github/workflows/X-x86_64_Z.yml @@ -186,7 +186,7 @@ jobs: cd openwrt if [ "${{ env.CACHE_ACCELERATE }}" == true ] then - echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE + echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE fi cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh diff --git a/.github/workflows/X-x86_64_Z_Mine.yml b/.github/workflows/X-x86_64_Z_Mine.yml index b92886e..c7095e0 100644 --- a/.github/workflows/X-x86_64_Z_Mine.yml +++ b/.github/workflows/X-x86_64_Z_Mine.yml @@ -176,7 +176,7 @@ jobs: cd openwrt if [ "${{ env.CACHE_ACCELERATE }}" == true ] then - echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE + echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE fi cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh diff --git a/Configs/x86_64-Y b/Configs/x86_64-Y index 5ed2759..411ba80 100644 --- a/Configs/x86_64-Y +++ b/Configs/x86_64-Y @@ -5,8 +5,8 @@ CONFIG_PACKAGE_smartdns=y CONFIG_PACKAGE_luci-app-smartdns=y CONFIG_PACKAGE_luci-i18n-smartdns-zh-cn=y # KERNEL_PATCHVER:=6.6 -# KERNEL_TESTING_PATCHVER:=6.1 -CONFIG_TESTING_KERNEL=y +# KERNEL_TESTING_PATCHVER:=6.12 +# CONFIG_TESTING_KERNEL=y # Theme CONFIG_PACKAGE_luci-theme-atmaterial-ColorIcon=y # CONFIG_PACKAGE_luci-theme-argon is not set diff --git a/Configs/x86_64-Z b/Configs/x86_64-Z index d3e2e39..4e10e02 100644 --- a/Configs/x86_64-Z +++ b/Configs/x86_64-Z @@ -10,8 +10,8 @@ CONFIG_IB=y CONFIG_IB_STANDALONE=y # KERNEL_PATCHVER:=6.6 -# KERNEL_TESTING_PATCHVER:=6.1 -CONFIG_TESTING_KERNEL=y +# KERNEL_TESTING_PATCHVER:=6.12 +# CONFIG_TESTING_KERNEL=y # Theme CONFIG_PACKAGE_luci-theme-atmaterial-ColorIcon=y CONFIG_PACKAGE_luci-theme-edge=y