fix passwall

fix
2026-09-27 07:14:43 +00:00 · 2026-06-11 23:47:24 +08:00 · 2026-06-11 23:09:31 +08:00 · 2026-06-11 22:54:58 +08:00 · 2026-06-11 22:46:43 +08:00 · 2026-06-11 22:42:56 +08:00
8 changed files with 144 additions and 244 deletions
@@ -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
@@ -255,6 +255,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
@@ -307,93 +310,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:  2 Upload SP_UEFI_VMDK to SharePoint
+      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: 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:  5 Upload SP_LEGACY_IMG_GZ to SharePoint
+      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: 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:  6 Upload SP_LEGACY_VMDK to SharePoint
+      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()
@@ -299,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
@@ -310,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
@@ -321,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
@@ -332,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
@@ -343,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
@@ -354,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
@@ -365,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
@@ -376,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
@@ -250,6 +250,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
@@ -302,93 +305,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:  2 Upload SP_UEFI_VMDK to SharePoint
+      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: 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:  5 Upload SP_LEGACY_IMG_GZ to SharePoint
+      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: 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:  6 Upload SP_LEGACY_VMDK to SharePoint
+      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
@@ -248,6 +249,9 @@ jobs:
        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 +304,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 }}
+    - name:  2 Upload SP_UEFI_VMDK to SharePoint
+      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 +334,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
@@ -344,30 +344,26 @@ jobs:
    #     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:  5 Upload SP_LEGACY_IMG_GZ to SharePoint
+      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:  6 Upload SP_LEGACY_VMDK to SharePoint
+      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 +374,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
@@ -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
@@ -95,8 +95,8 @@ EOF
 		# done ; unset x
 		
 		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_aria2_auto_create_download_path.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

@@ -113,10 +113,12 @@ EOF
 			patch < ${CustomFiles}/d-team_newifi-d2_mt76_dualband.patch -p1 -d ${WORK}
 		;;
 		x86_64)
+			rm -rf ${FEEDS_PKG}/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 ${FEEDS_LUCI}/applications/luci-app-passwall
 			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
Author	SHA1	Message	Date
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