fix upload path

fix s3 upload
fix S3 upload bug
2025-11-26 02:09:51 +08:00 · 2025-11-25 23:48:50 +08:00 · 2025-11-25 23:45:29 +08:00 · 2025-11-25 23:43:05 +08:00 · 2025-11-25 23:41:10 +08:00 · 2025-11-25 23:32:32 +08:00
3 changed files with 77 additions and 172 deletions
--- a/.github/workflows/X-x86_64_X.yml
+++ b/.github/workflows/X-x86_64_X.yml
@ -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: 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
-        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: ./openwrt/bin/Firmware/${{ 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: 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
-        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: ./openwrt/bin/Firmware/${{ 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: 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
-    #     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: ./openwrt/bin/Firmware/${{ 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: 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
-    #     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: 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
-        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: 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
-        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: 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
-    #     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: 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
-    #     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: ./openwrt/bin/Firmware/${{ 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()
--- a/.github/workflows/X-x86_64_Y.yml
+++ b/.github/workflows/X-x86_64_Y.yml
@ -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: 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
-        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: ./openwrt/bin/Firmware/${{ 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: 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
-        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: ./openwrt/bin/Firmware/${{ 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: 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
-    #     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: ./openwrt/bin/Firmware/${{ 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: 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
-    #     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: 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
-        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: 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
-        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: 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
-    #     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: 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
-    #     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: ./openwrt/bin/Firmware/${{ 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()
--- a/.github/workflows/X-x86_64_Z.yml
+++ b/.github/workflows/X-x86_64_Z.yml
@ -248,6 +248,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
@ -301,7 +304,7 @@ jobs:
        echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV

    - name: 1 Upload SP_UEFI_VMDK to SharePoint
-      uses: koraykoska/s3-upload-github-action@master
+      uses: xopenwrt/s3-upload-github-action@master
      env:
        FILE: ./openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
        S3_ENDPOINT: 's3.openwrt.115115.xyz'
@ -310,7 +313,7 @@ jobs:
        S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}

    - name:  2 Upload SP_UEFI_VMDK to SharePoint
-      uses: koraykoska/s3-upload-github-action@master
+      uses: xopenwrt/s3-upload-github-action@master
      env:
        FILE: ./openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
        S3_ENDPOINT: 's3.openwrt.115115.xyz'
@ -341,7 +344,7 @@ jobs:
    #     file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }}

    - name:  5 Upload SP_LEGACY_IMG_GZ to SharePoint
-      uses: koraykoska/s3-upload-github-action@master
+      uses: xopenwrt/s3-upload-github-action@master
      env:
        FILE: ./openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
        S3_ENDPOINT: 's3.openwrt.115115.xyz'
@ -350,7 +353,7 @@ jobs:
        S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}

    - name:  6 Upload SP_LEGACY_VMDK to SharePoint
-      uses: koraykoska/s3-upload-github-action@master
+      uses: xopenwrt/s3-upload-github-action@master
      env:
        FILE: ./openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
        S3_ENDPOINT: 's3.openwrt.115115.xyz'
Author	SHA1	Message	Date
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