disable lede adguardhome

fix apt err
sync err fix
2026-09-27 07:14:43 +00:00 · 2026-06-13 18:21:49 +08:00 · 2026-06-13 10:18:24 +08:00 · 2026-06-13 01:07:51 +08:00 · 2026-06-12 23:18:48 +08:00 · 2026-06-12 21:42:14 +08:00
24 changed files with 515 additions and 299 deletions
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -256,7 +256,7 @@ jobs:
        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
+      uses: xopenwrt/share-point-uploader@v2.3
      if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
      with:
        sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -267,7 +267,7 @@ jobs:
        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
+      uses: xopenwrt/share-point-uploader@v2.3
      if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
      with:
        sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -278,7 +278,7 @@ jobs:
        file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}

    # - name: 3 Upload SP_UEFI_VDI to SharePoint
-    #   uses: su-dont/share-point-uploader@v2.1
+    #   uses: xopenwrt/share-point-uploader@v2.3
    #   if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
    #   with:
    #     sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -289,7 +289,7 @@ jobs:
    #     file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}

    # - name: 4 Upload SP_UEFI_VHDX to SharePoint
-    #   uses: su-dont/share-point-uploader@v2.1
+    #   uses: xopenwrt/share-point-uploader@v2.3
    #   if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
    #   with:
    #     sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -300,7 +300,7 @@ jobs:
    #     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
+      uses: xopenwrt/share-point-uploader@v2.3
      if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
      with:
        sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -311,7 +311,7 @@ jobs:
        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
+      uses: xopenwrt/share-point-uploader@v2.3
      if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
      with:
        sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -322,7 +322,7 @@ jobs:
        file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}

    # - name: 7 Upload SP_LEGACY_VDI to SharePoint
-    #   uses: su-dont/share-point-uploader@v2.1
+    #   uses: xopenwrt/share-point-uploader@v2.3
    #   if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
    #   with:
    #     sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -333,7 +333,7 @@ jobs:
    #     file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}

    # - name: 8 Upload SP_LEGACY_VHDX to SharePoint
-    #   uses: su-dont/share-point-uploader@v2.1
+    #   uses: xopenwrt/share-point-uploader@v2.3
    #   if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
    #   with:
    #     sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -72,7 +72,6 @@ jobs:
        echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV
        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
@@ -81,11 +80,11 @@ jobs:
    - name: Maximize Build Space
      uses: easimon/maximize-build-space@master
      with:
-        root-reserve-mb: 3500
-        swap-size-mb: 100
+        root-reserve-mb: 4096
+        swap-size-mb: 512
+        temp-reserve-mb: 1024
        remove-dotnet: 'true'
        remove-android: 'true'
-        remove-haskell: 'true'

    - name: Checkout
      uses: actions/checkout@main
@@ -152,7 +151,7 @@ jobs:
        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 build-essential cmake 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 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
@@ -181,7 +180,7 @@ jobs:
        ./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
+        git clone https://github.com/sbwml/packages_lang_golang -b 26.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug

@@ -191,7 +190,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
@@ -213,8 +212,11 @@ jobs:
    - name: Build OpenWrt
      run: |
        cd openwrt
+        rm -rf package/feeds/packages/net/{xray-core,v2ray-geodata,sing-box,chinadns-ng,dns2socks,hysteria,ipt2socks,microsocks,naiveproxy,shadowsocks-rust,shadowsocksr-libev,simple-obfs,tcping,v2ray-plugin,xray-plugin,geoview,shadow-tls}
+        rm -rf package/feeds/luci/applications/luci-app-passwall
        rm package/feeds/packages/adguardhome -rf
        rm feeds/packages/net/adguardhome -rf
+        rm feeds/luci/applications/luci-app-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
@@ -256,6 +258,9 @@ jobs:
        cd openwrt
        source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
        Firmware_Diy_End
+        cd ..
+        mkdir ${{ steps.date.outputs.date }}
+        cp openwrt/bin/Firmware/* ./${{ steps.date.outputs.date }} -r

    - name: Upload Firmware to Artifacts
      uses: actions/upload-artifact@main
@@ -308,93 +313,41 @@ jobs:
        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: 1 Upload SP_UEFI_VMDK to SharePoint
+      uses: xopenwrt/s3-upload-github-action@master
+      env:
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_IMG_GZ }}
+        S3_ENDPOINT: 's3.openwrt.115115.xyz'
+        S3_BUCKET: ${{ secrets.S3_BUCKET }}
+        S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+        S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}

    - 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 }}
+      uses: xopenwrt/s3-upload-github-action@master
+      env:
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_VMDK }}
+        S3_ENDPOINT: 's3.openwrt.115115.xyz'
+        S3_BUCKET: ${{ secrets.S3_BUCKET }}
+        S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+        S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}

    - 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 }}
+      uses: xopenwrt/s3-upload-github-action@master
+      env:
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_IMG_GZ }}
+        S3_ENDPOINT: 's3.openwrt.115115.xyz'
+        S3_BUCKET: ${{ secrets.S3_BUCKET }}
+        S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+        S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}

    - 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 }}
+      uses: xopenwrt/s3-upload-github-action@master
+      env:
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_VMDK }}
+        S3_ENDPOINT: 's3.openwrt.115115.xyz'
+        S3_BUCKET: ${{ secrets.S3_BUCKET }}
+        S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+        S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}

    - name: Delete VM Disk File
      if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
@@ -170,7 +170,7 @@ jobs:
        ./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
+        git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug

@@ -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
@@ -207,7 +207,8 @@ jobs:
        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)) | 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


@@ -298,7 +299,7 @@ jobs:
        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
+      uses: xopenwrt/share-point-uploader@v2.3
      if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
      with:
        sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -309,7 +310,7 @@ jobs:
        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
+      uses: xopenwrt/share-point-uploader@v2.3
      if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
      with:
        sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -320,7 +321,7 @@ jobs:
        file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}

    # - name: 3 Upload SP_UEFI_VDI to SharePoint
-    #   uses: su-dont/share-point-uploader@v2.1
+    #   uses: xopenwrt/share-point-uploader@v2.3
    #   if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
    #   with:
    #     sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -331,7 +332,7 @@ jobs:
    #     file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}

    # - name: 4 Upload SP_UEFI_VHDX to SharePoint
-    #   uses: su-dont/share-point-uploader@v2.1
+    #   uses: xopenwrt/share-point-uploader@v2.3
    #   if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
    #   with:
    #     sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -342,7 +343,7 @@ jobs:
    #     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
+      uses: xopenwrt/share-point-uploader@v2.3
      if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
      with:
        sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -353,7 +354,7 @@ jobs:
        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
+      uses: xopenwrt/share-point-uploader@v2.3
      if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
      with:
        sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -364,7 +365,7 @@ jobs:
        file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}

    # - name: 7 Upload SP_LEGACY_VDI to SharePoint
-    #   uses: su-dont/share-point-uploader@v2.1
+    #   uses: xopenwrt/share-point-uploader@v2.3
    #   if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
    #   with:
    #     sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -375,7 +376,7 @@ jobs:
    #     file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}

    # - name: 8 Upload SP_LEGACY_VHDX to SharePoint
-    #   uses: su-dont/share-point-uploader@v2.1
+    #   uses: xopenwrt/share-point-uploader@v2.3
    #   if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
    #   with:
    #     sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -65,11 +65,11 @@ jobs:
    - name: Maximize Build Space
      uses: easimon/maximize-build-space@master
      with:
-        root-reserve-mb: 5120
+        root-reserve-mb: 4096
        swap-size-mb: 512
+        temp-reserve-mb: 1024
        remove-dotnet: 'true'
        remove-android: 'true'
-        remove-haskell: 'true'

    - name: Checkout
      uses: actions/checkout@main
@@ -142,14 +142,13 @@ jobs:
        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 build-essential cmake 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 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
        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
@@ -178,7 +177,7 @@ jobs:
        ./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
+        git clone https://github.com/sbwml/packages_lang_golang -b 26.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug

@@ -188,7 +187,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
@@ -210,8 +209,11 @@ jobs:
    - name: Build OpenWrt
      run: |
        cd openwrt
+        rm -rf package/feeds/packages/net/{xray-core,v2ray-geodata,sing-box,chinadns-ng,dns2socks,hysteria,ipt2socks,microsocks,naiveproxy,shadowsocks-rust,shadowsocksr-libev,simple-obfs,tcping,v2ray-plugin,xray-plugin,geoview,shadow-tls}
+        rm -rf package/feeds/luci/applications/luci-app-passwall
        rm package/feeds/packages/adguardhome -rf
        rm feeds/packages/net/adguardhome -rf
+        rm feeds/luci/applications/luci-app-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
@@ -251,6 +253,9 @@ jobs:
        cd openwrt
        source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
        Firmware_Diy_End
+        cd ..
+        mkdir ${{ steps.date.outputs.date }}
+        cp openwrt/bin/Firmware/* ./${{ steps.date.outputs.date }} -r

    - name: Upload Firmware to Artifacts
      uses: actions/upload-artifact@main
@@ -303,93 +308,41 @@ jobs:
        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: 1 Upload SP_UEFI_VMDK to SharePoint
+      uses: xopenwrt/s3-upload-github-action@master
+      env:
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_IMG_GZ }}
+        S3_ENDPOINT: 's3.openwrt.115115.xyz'
+        S3_BUCKET: ${{ secrets.S3_BUCKET }}
+        S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+        S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}

    - 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 }}
+      uses: xopenwrt/s3-upload-github-action@master
+      env:
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_VMDK }}
+        S3_ENDPOINT: 's3.openwrt.115115.xyz'
+        S3_BUCKET: ${{ secrets.S3_BUCKET }}
+        S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+        S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}

    - 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 }}
+      uses: xopenwrt/s3-upload-github-action@master
+      env:
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_IMG_GZ }}
+        S3_ENDPOINT: 's3.openwrt.115115.xyz'
+        S3_BUCKET: ${{ secrets.S3_BUCKET }}
+        S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+        S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}

    - 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 }}
+      uses: xopenwrt/s3-upload-github-action@master
+      env:
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_VMDK }}
+        S3_ENDPOINT: 's3.openwrt.115115.xyz'
+        S3_BUCKET: ${{ secrets.S3_BUCKET }}
+        S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+        S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}

    - name: Delete VM Disk File
      if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
@@ -65,8 +65,9 @@ jobs:
    - name: Maximize Build Space
      uses: easimon/maximize-build-space@master
      with:
-        root-reserve-mb: 5120
+        root-reserve-mb: 4096
        swap-size-mb: 512
+        temp-reserve-mb: 1024
        remove-dotnet: 'true'
        remove-android: 'true'

@@ -139,7 +140,7 @@ jobs:
        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 build-essential cmake 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 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
@@ -147,7 +148,6 @@ jobs:
        if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
        then
          docker images
-          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
@@ -176,7 +176,7 @@ jobs:
        ./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
+        git clone https://github.com/sbwml/packages_lang_golang -b 26.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug

@@ -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
@@ -208,8 +208,11 @@ jobs:
    - name: Build OpenWrt
      run: |
        cd openwrt
+        rm -rf package/feeds/packages/net/{xray-core,v2ray-geodata,sing-box,chinadns-ng,dns2socks,hysteria,ipt2socks,microsocks,naiveproxy,shadowsocks-rust,shadowsocksr-libev,simple-obfs,tcping,v2ray-plugin,xray-plugin,geoview,shadow-tls}
+        rm -rf package/feeds/luci/applications/luci-app-passwall
        rm package/feeds/packages/adguardhome -rf
        rm feeds/packages/net/adguardhome -rf
+        rm feeds/luci/applications/luci-app-adguardhome -rf
        ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
        make -j4 | tee ./build_log.log || make -j1 V=s
        # 2024.03.03 mosdns build fail by golang 1.22
@@ -248,6 +251,10 @@ jobs:
        cd openwrt
        source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
        Firmware_Diy_End
+        ls bin/Firmware
+        cd ..
+        mkdir ${{ steps.date.outputs.date }}
+        cp openwrt/bin/Firmware/* ./${{ steps.date.outputs.date }} -r

    - name: Upload Firmware to Artifacts
      uses: actions/upload-artifact@main
@@ -300,30 +307,26 @@ jobs:
        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: 1 Upload SP_UEFI_VMDK to SharePoint
+      uses: xopenwrt/s3-upload-github-action@master
+      env:
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_IMG_GZ }}
+        S3_ENDPOINT: 's3.openwrt.115115.xyz'
+        S3_BUCKET: ${{ secrets.S3_BUCKET }}
+        S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+        S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}

    - 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 }}
+      uses: xopenwrt/s3-upload-github-action@master
+      env:
+        FILE: ./${{ steps.date.outputs.date }}e/${{ env.SP_UEFI_VMDK }}
+        S3_ENDPOINT: 's3.openwrt.115115.xyz'
+        S3_BUCKET: ${{ secrets.S3_BUCKET }}
+        S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+        S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}

    # - name: 3 Upload SP_UEFI_VDI to SharePoint
-    #   uses: su-dont/share-point-uploader@v2.1
+    #   uses: xopenwrt/share-point-uploader@v2.3
    #   if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
    #   with:
    #     sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -334,7 +337,7 @@ jobs:
    #     file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}

    # - name: 4 Upload SP_UEFI_VHDX to SharePoint
-    #   uses: su-dont/share-point-uploader@v2.1
+    #   uses: xopenwrt/share-point-uploader@v2.3
    #   if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
    #   with:
    #     sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -345,29 +348,25 @@ jobs:
    #     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 }}
+      uses: xopenwrt/s3-upload-github-action@master
+      env:
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_IMG_GZ }}
+        S3_ENDPOINT: 's3.openwrt.115115.xyz'
+        S3_BUCKET: ${{ secrets.S3_BUCKET }}
+        S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+        S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}

    - 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 }}
+      uses: xopenwrt/s3-upload-github-action@master
+      env:
+        FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_VMDK }}
+        S3_ENDPOINT: 's3.openwrt.115115.xyz'
+        S3_BUCKET: ${{ secrets.S3_BUCKET }}
+        S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
+        S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}

    # - name: 7 Upload SP_LEGACY_VDI to SharePoint
-    #   uses: su-dont/share-point-uploader@v2.1
+    #   uses: xopenwrt/share-point-uploader@v2.3
    #   if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
    #   with:
    #     sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -378,7 +377,7 @@ jobs:
    #     file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}

    # - name: 8 Upload SP_LEGACY_VHDX to SharePoint
-    #   uses: su-dont/share-point-uploader@v2.1
+    #   uses: xopenwrt/share-point-uploader@v2.3
    #   if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
    #   with:
    #     sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -392,6 +391,7 @@ jobs:
      if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
      run: |
        rm openwrt/bin/Firmware/AutoBuild-*.v* -rf
+        ls openwrt/bin/Firmware

    - name: Upload Firmware to Github Release
      uses: svenstaro/upload-release-action@v2
@@ -166,7 +166,7 @@ jobs:
        ./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
+        git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
 #        sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
 #fix dockerd bug

@@ -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
@@ -291,7 +291,7 @@ jobs:
        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
+      uses: xopenwrt/share-point-uploader@v2.3
      if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
      with:
        sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -302,7 +302,7 @@ jobs:
        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
+      uses: xopenwrt/share-point-uploader@v2.3
      if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
      with:
        sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -313,7 +313,7 @@ jobs:
        file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}

    # - name: 3 Upload SP_UEFI_VDI to SharePoint
-    #   uses: su-dont/share-point-uploader@v2.1
+    #   uses: xopenwrt/share-point-uploader@v2.3
    #   if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
    #   with:
    #     sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -324,7 +324,7 @@ jobs:
    #     file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}

    # - name: 4 Upload SP_UEFI_VHDX to SharePoint
-    #   uses: su-dont/share-point-uploader@v2.1
+    #   uses: xopenwrt/share-point-uploader@v2.3
    #   if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
    #   with:
    #     sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -335,7 +335,7 @@ jobs:
    #     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
+      uses: xopenwrt/share-point-uploader@v2.3
      if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
      with:
        sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -346,7 +346,7 @@ jobs:
        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
+      uses: xopenwrt/share-point-uploader@v2.3
      if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
      with:
        sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -357,7 +357,7 @@ jobs:
        file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}

    # - name: 7 Upload SP_LEGACY_VDI to SharePoint
-    #   uses: su-dont/share-point-uploader@v2.1
+    #   uses: xopenwrt/share-point-uploader@v2.3
    #   if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
    #   with:
    #     sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -368,7 +368,7 @@ jobs:
    #     file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}

    # - name: 8 Upload SP_LEGACY_VHDX to SharePoint
-    #   uses: su-dont/share-point-uploader@v2.1
+    #   uses: xopenwrt/share-point-uploader@v2.3
    #   if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
    #   with:
    #     sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -0,0 +1,222 @@
+###########################################################
+#   Description: Compile OpenWrt by GitHub Actions        #
+#   Based on: https://github.com/P3TERX/Actions-OpenWrt   #
+#   Author: Xinb                                      #
+###########################################################
+
+name: x86_64_Z_Mine_Home
+
+### 以下内容请保持不变 (请修改下方的 环境变量设置)
+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-Z'
+      Tempoary_FLAG:
+        description: '固件名称后缀 [可选]'
+        default: 'Z'
+### 结束
+
+  #push:
+  #  branches: 
+  #    - master
+
+  #schedule:
+  #  - cron: 0 8 * * 5
+
+  #watch:
+  #  types: [started]
+
+### 环境变量设置
+env:
+# 编译时调用的 [.config] 文件名称
+  CONFIG_FILE: x86_64-Z-Test
+# 源码仓库:分支
+  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: 7940hx
+    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:18-alpine node:16-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest node:16 ubuntu:20.04 debian:9 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 25.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=n\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 -j8
+
+    - 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
+        make -j$(($(nproc) + 1)) || lscpu
+        # 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
+        [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
+
+    - name: Process Firmware
+      if: env.Result == 'true' && !cancelled()
+      run: |
+        cd openwrt
+        source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
+        Firmware_Diy_End
+
+
+    - 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
@@ -18,11 +18,11 @@ CONFIG_PACKAGE_hostapd-common=y
 CONFIG_PACKAGE_wpa-supplicant=y

 # Theme
-CONFIG_PACKAGE_luci-theme-atmaterial-ColorIcon=y
-# CONFIG_PACKAGE_luci-theme-edge=y
+
+# 
 # # CONFIG_PACKAGE_luci-theme-argon is not set
 # CONFIG_PACKAGE_luci-theme-argon-mod=y
-# CONFIG_PACKAGE_luci-theme-neobird=y
+# # CONFIG_PACKAGE_luci-theme-neobird is not set
 # passwall
 # CONFIG_PACKAGE_luci-app-passwall=y
 # # Adguard Home
@@ -13,14 +13,14 @@ CONFIG_PACKAGE_luci-lib-docker=y
 # Hello World
 # CONFIG_PACKAGE_luci-app-vssr=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-bootstrap=y
 CONFIG_PACKAGE_luci-theme-material=y
-CONFIG_PACKAGE_luci-theme-neobird=y
-CONFIG_PACKAGE_luci-theme-edge=y
+# CONFIG_PACKAGE_luci-theme-neobird is not set
+

 # wifi
 # 7625d Adapter
@@ -124,7 +124,7 @@ CONFIG_PACKAGE_luci-app-nfs=y
 CONFIG_PACKAGE_luci-app-npc=y
 CONFIG_PACKAGE_luci-app-openclash=y
 CONFIG_PACKAGE_luci-app-onliner=y
-CONFIG_PACKAGE_luci-app-passwall2=y
+CONFIG_PACKAGE_luci-app-passwall=y
 CONFIG_PACKAGE_luci-app-pptp-server=y
 CONFIG_PACKAGE_luci-app-qbittorrent=y
 # CONFIG_PACKAGE_luci-app-qbittorrent_dynamic is not set
@@ -5,16 +5,16 @@ 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
 CONFIG_PACKAGE_luci-theme-argon-mod=y
-CONFIG_PACKAGE_luci-theme-neobird=y
-CONFIG_PACKAGE_luci-theme-edge=y
+# CONFIG_PACKAGE_luci-theme-neobird is not set
+
 # passwall
-CONFIG_PACKAGE_luci-app-passwall2=y
+CONFIG_PACKAGE_luci-app-passwall=y
 # Adguard Home
 CONFIG_PACKAGE_luci-app-adguardhome=y
 CONFIG_PACKAGE_adguardhome=y
@@ -10,16 +10,16 @@ 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
+
+
 # CONFIG_PACKAGE_luci-theme-argon is not set
 CONFIG_PACKAGE_luci-theme-argon-mod=y
-CONFIG_PACKAGE_luci-theme-neobird=y
+# CONFIG_PACKAGE_luci-theme-neobird is not set
 # passwall
-CONFIG_PACKAGE_luci-app-passwall2=y
+CONFIG_PACKAGE_luci-app-passwall=y
 # Adguard Home
 CONFIG_PACKAGE_luci-app-adguardhome=y
 CONFIG_PACKAGE_adguardhome=y
@@ -0,0 +1,83 @@
+# 挂载WebDav
+CONFIG_PACKAGE_davfs2=y
+# Smart DNS
+CONFIG_PACKAGE_smartdns=y
+CONFIG_PACKAGE_luci-app-smartdns=y
+CONFIG_PACKAGE_luci-i18n-smartdns-zh-cn=y
+
+# Image Builder
+CONFIG_IB=y
+CONFIG_IB_STANDALONE=y
+
+# KERNEL_PATCHVER:=6.6
+# KERNEL_TESTING_PATCHVER:=6.1
+CONFIG_TESTING_KERNEL=y
+# Theme
+
+
+# CONFIG_PACKAGE_luci-theme-argon is not set
+CONFIG_PACKAGE_luci-theme-argon-mod=y
+# CONFIG_PACKAGE_luci-theme-neobird is not set
+# passwall
+CONFIG_PACKAGE_luci-app-passwall2=y
+# Adguard Home
+CONFIG_PACKAGE_luci-app-adguardhome=y
+CONFIG_PACKAGE_adguardhome=y
+# Dnsmasq 及IPV6,AutoUpdate
+CONFIG_PACKAGE_dnsmasq-full=y
+CONFIG_PACKAGE_dnsmasq_full_dhcp=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
+
+# KMS
+CONFIG_PACKAGE_vlmcsd=y
+CONFIG_PACKAGE_luci-i18n-vlmcsd-zh-cn=y
+CONFIG_PACKAGE_luci-app-vlmcsd=y
+
+# Netdata
+CONFIG_PACKAGE_luci-app-netdata=y
+# Diskman
+CONFIG_PACKAGE_luci-app-diskman=y
+CONFIG_PACKAGE_luci-app-diskman_INCLUDE_btrfs_progs=y
+CONFIG_PACKAGE_luci-app-diskman_INCLUDE_lsblk=y
+CONFIG_PACKAGE_luci-app-diskman_INCLUDE_mdadm=y
+
+CONFIG_TARGET_x86=y
+CONFIG_TARGET_x86_64=y
+CONFIG_TARGET_x86_64_DEVICE_generic=y
+
+CONFIG_GRUB_IMAGES=y
+CONFIG_VMDK_IMAGES=y
+CONFIG_VDI_IMAGES=y
+CONFIG_VHDX_IMAGES=y
+CONFIG_GRUB_TITLE="OpenWrt for x86_64-Z & Powered by Xinb"
+CONFIG_TARGET_KERNEL_PARTSIZE=32
+CONFIG_TARGET_ROOTFS_PARTSIZE=800
+# CONFIG_GRUB_CONSOLE is not set
+CONFIG_TARGET_IMAGES_GZIP=y
+CONFIG_PACKAGE_ntfs3-mount=y
+
+
+# CONFIG_SIGNATURE_CHECK is not set
+# CONFIG_SIGNED_PACKAGES is not set
+# CONFIG_PACKAGE_luci-app-unblockmusic is not set
+# CONFIG_PACKAGE_luci-app-unblockmusic_INCLUDE_UnblockNeteaseMusic_Go is not set
+# CONFIG_PACKAGE_luci-app-unblockmusic_INCLUDE_UnblockNeteaseMusic_NodeJS is not set
+# CONFIG_PACKAGE_luci-app-adbyby-plus is not set
+# CONFIG_PACKAGE_adbyby is not set
+# CONFIG_PACKAGE_luci-app-wireguard is not set
+# CONFIG_PACKAGE_luci-app-ssr-plus is not set
+# CONFIG_PACKAGE_luci-app-wol is not set
+# CONFIG_PACKAGE_luci-app-xlnetacc is not set
+# CONFIG_PACKAGE_luci-app-upnp is not set
+# CONFIG_PACKAGE_luci-app-qbittorrent is not set
+# CONFIG_PACKAGE_luci-app-vsftpd is not set
+# CONFIG_PACKAGE_luci-app-samba is not set
+# CONFIG_PACKAGE_autosamba is not set
@@ -78,7 +78,7 @@ EOF
 		done ; unset i

 		AddPackage svn apps minieap immortalwrt openwrt-18.06 packages net
-		AddPackage git other luci-theme-atmaterial-ColorIcon esirplayground master
+		# AddPackage git other luci-theme-atmaterial-ColorIcon esirplayground master
 		AddPackage git lean luci-app-argon-config jerrykuku master
 		AddPackage git other OpenClash vernesong master
 		# AddPackage git other luci-app-vssr jerrykuku master
@@ -96,7 +96,7 @@ EOF
 		
 		patch < ${CustomFiles}/Patches/fix_coremark.patch -p1 -d ${WORK}
 		# patch < ${CustomFiles}/Patches/fix_aria2_auto_create_download_path.patch -p1 -d ${WORK}
-		patch < ${CustomFiles}/Patches/fix_luci-app-autoreboot-generic.patch -p1 -d ${WORK}
+		# patch < ${CustomFiles}/Patches/fix_luci-app-autoreboot-generic.patch -p1 -d ${WORK}
 		# delete adguardhome in lede package
 		# rm package/feeds/packages/net/adguardhome -rf

@@ -114,16 +114,16 @@ EOF
 		;;
 		x86_64)
 			Copy ${CustomFiles}/Depends/cpuset ${BASE_FILES}/bin
-			AddPackage git passwall-depends openwrt-passwall-packages xiaorouji main
-			AddPackage git passwall-luci openwrt-passwall xiaorouji main
-			AddPackage git passwall2-luci openwrt-passwall2 xiaorouji main
+			AddPackage git passwall-packages openwrt-passwall-packages Openwrt-Passwall main
+			AddPackage git passwall-luci openwrt-passwall Openwrt-Passwall main
+			AddPackage git passwall2-luci openwrt-passwall2 Openwrt-Passwall main
 			AddPackage git other luci-app-dockerman lisaac master
 			rm -rf packages/lean/autocore # May Can Delete
 			AddPackage git lean autocore-modify xopenwrt master
 			sed -i -- 's:/bin/ash:'/bin/bash':g' ${BASE_FILES}/etc/passwd
 			#sed -i "s?6.0?5.19?g" ${WORK}/target/linux/x86/Makefile
 			# patch < ${CustomFiles}/Patches/upgrade_intel_igpu_drv.patch -p1 -d ${WORK}
-			patch < ${CustomFiles}/Patches/fix_mac80211.patch -p1 -d ${WORK}
+			# patch < ${CustomFiles}/Patches/fix_mac80211.patch -p1 -d ${WORK}
 			#fix hostapd
 			sed -i "s/\#CONFIG_AP/CONFIG_AP/g" ${WORK}/package/network/services/hostapd/files/wpa*
 		;;
@@ -23,8 +23,11 @@ Firmware_Diy_Before() {
 	fi
 	case "${OP_AUTHOR}/${OP_REPO}" in
 	coolsnowwolf/lede)
+		# Version_File=package/lean/default-settings/files/zzz-default-settings
+		# zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})"
 		Version_File=package/lean/default-settings/files/zzz-default-settings
-		zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})"
+		Version_Raw=$(cat package/lean/default-settings/files/zzz-default-settings | grep DISTRIB_REVISION)
+		zzz_Default_Version="$(echo $Version_Raw | egrep -o "R[0-9]+\.[0-9]+\.[0-9]+")"
 		OP_VERSION="${zzz_Default_Version}-${Compile_Date}"
 	;;
 	immortalwrt/immortalwrt)
@@ -17,7 +17,8 @@ df -h
 echo "------------------------------- IP Address Info ------------------------------"
 IP=`curl ip.115115.xyz -s`
 curl ip.115115.xyz -s
-curl -s https://searchplugin.csdn.net/api/v1/ip/get?ip=${IP} | jq -r .data.address
+# curl -s https://searchplugin.csdn.net/api/v1/ip/get?ip=${IP} | jq -r .data.address
+curl -s  https://api.vore.top/api/IPdata?ip=${IP} | jq -r .adcode.o
 }

 Get_Release_Info() {
Author	SHA1	Message	Date
xopenwrt	61444d2c11	disable lede adguardhome	2026-06-13 18:21:49 +08:00
xopenwrt	ce4d832d49	fix apt err	2026-06-13 10:18:24 +08:00
xopenwrt	c6944feabf	sync err fix	2026-06-13 01:07:51 +08:00
xopenwrt	57513cf4f8	update golang	2026-06-12 23:18:48 +08:00
xopenwrt	da8ae4c8ef	fix bug	2026-06-12 21:42:14 +08:00
xopenwrt	44c434d397	fix passwall	2026-06-12 21:37:32 +08:00
xopenwrt	762d1ecd06	fix passwall	2026-06-11 23:47:24 +08:00
xopenwrt	0e31ac6248	fix	2026-06-11 23:09:31 +08:00
xopenwrt	856ce8b5b5	fix	2026-06-11 22:54:58 +08:00
xopenwrt	dc6091db1a	fix	2026-06-11 22:46:43 +08:00
xopenwrt	daf9fdc776	fix	2026-06-11 22:42:56 +08:00
xopenwrt	54f624a756	fIx	2026-06-11 22:34:16 +08:00
xopenwrt	a665e75fa7	fix	2026-06-11 22:20:43 +08:00
xopenwrt	c62782c5d0	fix	2026-05-12 00:24:23 +08:00
xopenwrt	8770c61074	fix	2026-05-10 23:52:56 +08:00
xopenwrt	313bebb686	fix	2026-05-10 23:38:47 +08:00
xopenwrt	48675fbfc8	Release New Version	2025-11-27 10:30:50 +08:00
xopenwrt	4e37e8d084	fix action upload	2025-11-26 19:34:44 +08:00
xopenwrt	732b5f3844	Test	2025-11-26 19:17:39 +08:00
xopenwrt	d0be16a8cb	Test upload	2025-11-26 19:15:12 +08:00
xopenwrt	e4a1159b3a	fix upload path	2025-11-26 02:09:51 +08:00
xopenwrt	d24793566c	fix s3 upload	2025-11-25 23:48:50 +08:00
xopenwrt	a34b742edd	fix S3 upload bug	2025-11-25 23:45:29 +08:00
xopenwrt	d5ab5a6b2c	update	2025-11-25 23:43:05 +08:00
xopenwrt	225c014e56	update	2025-11-25 23:41:10 +08:00
xopenwrt	bff723d35c	test	2025-11-25 23:32:32 +08:00
xopenwrt	c80752ddf7	Add API Test	2025-11-25 23:20:35 +08:00
xopenwrt	4e0ccaf038	test S3 upload	2025-11-25 19:49:01 +08:00
xopenwrt	5e08d7e060	update uploader	2025-11-25 12:55:09 +08:00
xopenwrt	caf11ba27e	fix sharepoint uploader	2025-11-25 09:55:51 +08:00
xopenwrt	2e53d1b1f1	update golang version	2025-11-25 00:14:07 +08:00
xopenwrt	de3b57e64e	fix	2025-11-22 21:58:53 +08:00
xopenwrt	c43892ad94	test	2025-11-22 19:38:19 +08:00
xopenwrt	71e6f55a4e	remove mac80211 patch	2025-11-22 15:16:25 +08:00
xopenwrt	6c7873d959	fix Release get	2025-11-22 15:08:39 +08:00
xopenwrt	f9b26dbad4	rm docker image rm	2025-11-22 14:49:26 +08:00
xopenwrt	dfc88ebf8a	fix ip API	2025-11-22 14:29:58 +08:00
xopenwrt	696b8de1e8	Remove err theme	2024-12-09 01:54:22 +08:00
xopenwrt	b6a5ac592d	revert passwall2 to passwall	2024-12-09 01:45:04 +08:00
xopenwrt	b317947b55	close CCACHE to fix vlmcsd build err	2024-12-08 23:05:49 +08:00
xopenwrt	68ae53cdc7	Test	2024-12-08 22:34:18 +08:00
xopenwrt	7612a90e97	Test	2024-12-08 22:14:00 +08:00
xopenwrt	3e51857c93	Test	2024-12-08 22:11:45 +08:00
xopenwrt	99725eccb2	set kernel 6.1	2024-12-07 23:32:22 +08:00
xopenwrt	f367a47f5a	Test	2024-12-06 03:23:59 +08:00
xopenwrt	a4cc1e452f	delete image upload	2024-12-06 02:58:38 +08:00
xopenwrt	69ef21e6d8	Test	2024-12-06 02:00:43 +08:00
xopenwrt	99b5a7e516	Test	2024-12-06 01:27:39 +08:00