Compare commits
No commits in common. "e4a1159b3a3076e1002945e21487a2743ed23192" and "4e0ccaf03890d516eb338819440377d286c23c2b" have entirely different histories.
e4a1159b3a
...
4e0ccaf038
|
|
@ -255,9 +255,6 @@ 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
|
||||
|
|
@ -310,41 +307,93 @@ 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_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: 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: 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: 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: 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: 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: 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: 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: Delete VM Disk File
|
||||
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||
|
|
|
|||
|
|
@ -250,9 +250,6 @@ 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
|
||||
|
|
@ -305,41 +302,93 @@ 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_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: 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: 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: 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: 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: 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: 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: 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: Delete VM Disk File
|
||||
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||
|
|
|
|||
|
|
@ -248,9 +248,6 @@ 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
|
||||
|
|
@ -304,7 +301,7 @@ jobs:
|
|||
echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV
|
||||
|
||||
- name: 1 Upload SP_UEFI_VMDK to SharePoint
|
||||
uses: xopenwrt/s3-upload-github-action@master
|
||||
uses: koraykoska/s3-upload-github-action@master
|
||||
env:
|
||||
FILE: ./openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
|
||||
S3_ENDPOINT: 's3.openwrt.115115.xyz'
|
||||
|
|
@ -313,7 +310,7 @@ jobs:
|
|||
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
|
||||
|
||||
- name: 2 Upload SP_UEFI_VMDK to SharePoint
|
||||
uses: xopenwrt/s3-upload-github-action@master
|
||||
uses: koraykoska/s3-upload-github-action@master
|
||||
env:
|
||||
FILE: ./openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
|
||||
S3_ENDPOINT: 's3.openwrt.115115.xyz'
|
||||
|
|
@ -344,7 +341,7 @@ jobs:
|
|||
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }}
|
||||
|
||||
- name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint
|
||||
uses: xopenwrt/s3-upload-github-action@master
|
||||
uses: koraykoska/s3-upload-github-action@master
|
||||
env:
|
||||
FILE: ./openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
|
||||
S3_ENDPOINT: 's3.openwrt.115115.xyz'
|
||||
|
|
@ -353,7 +350,7 @@ jobs:
|
|||
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
|
||||
|
||||
- name: 6 Upload SP_LEGACY_VMDK to SharePoint
|
||||
uses: xopenwrt/s3-upload-github-action@master
|
||||
uses: koraykoska/s3-upload-github-action@master
|
||||
env:
|
||||
FILE: ./openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
|
||||
S3_ENDPOINT: 's3.openwrt.115115.xyz'
|
||||
|
|
|
|||
Loading…
Reference in New Issue