From d24793566c1bef461045af852cb82a284c739452 Mon Sep 17 00:00:00 2001 From: xopenwrt <98641952+xopenwrt@users.noreply.github.com> Date: Tue, 25 Nov 2025 23:48:50 +0800 Subject: [PATCH] fix s3 upload --- .github/workflows/X-x86_64_X.yml | 116 +++++++++---------------------- .github/workflows/X-x86_64_Y.yml | 116 +++++++++---------------------- 2 files changed, 64 insertions(+), 168 deletions(-) diff --git a/.github/workflows/X-x86_64_X.yml b/.github/workflows/X-x86_64_X.yml index 7177fd8..01a64fa 100644 --- a/.github/workflows/X-x86_64_X.yml +++ b/.github/workflows/X-x86_64_X.yml @@ -307,93 +307,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() diff --git a/.github/workflows/X-x86_64_Y.yml b/.github/workflows/X-x86_64_Y.yml index b651bd1..079169d 100644 --- a/.github/workflows/X-x86_64_Y.yml +++ b/.github/workflows/X-x86_64_Y.yml @@ -302,93 +302,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()