xinb
/
X-OpenWrt
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: xinb:4e0ccaf03890d516eb338819440377d286c23c2b
Branches Tags
xinb:master
xinb:dev
xinb:v2025-11-26
xinb:v2025-11-25
xinb:v2025-11-24
xinb:v2025-11-22
xinb:v2025-07-20
xinb:v2025-07-21
xinb:v2024-12-12
xinb:v2024-12-08
xinb:v2024-12-09
xinb:v2024-12-07
xinb:v2024-12-05
xinb:v2024-12-06
xinb:v2024-09-22
xinb:v2024-06-16
xinb:v2024-06-12
xinb:v2024-06-04
xinb:v2024-05-21
xinb:v2024-04-17
xinb:v2024-03-04
xinb:v2024-03-03
xinb:v2024-03-02
xinb:v2024-01-19
xinb:AutoUpdate_old
xinb:AutoUpdate
...
compare: xinb:e4a1159b3a3076e1002945e21487a2743ed23192
Branches Tags
xinb:master
xinb:dev
xinb:v2025-11-26
xinb:v2025-11-25
xinb:v2025-11-24
xinb:v2025-11-22
xinb:v2025-07-20
xinb:v2025-07-21
xinb:v2024-12-12
xinb:v2024-12-08
xinb:v2024-12-09
xinb:v2024-12-07
xinb:v2024-12-05
xinb:v2024-12-06
xinb:v2024-09-22
xinb:v2024-06-16
xinb:v2024-06-12
xinb:v2024-06-04
xinb:v2024-05-21
xinb:v2024-04-17
xinb:v2024-03-04
xinb:v2024-03-03
xinb:v2024-03-02
xinb:v2024-01-19
xinb:AutoUpdate_old
xinb:AutoUpdate

7 Commits
4e0ccaf038 ... e4a1159b3a

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
3 changed files with 77 additions and 172 deletions
Show Stats Expand all files Collapse all files

113
.github/workflows/X-x86_64_X.yml vendored
View File

@ -255,6 +255,9 @@ jobs:
cd openwrt cd openwrt
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
Firmware_Diy_End Firmware_Diy_End
cd ..
mkdir ${{ steps.date.outputs.date }}
cp openwrt/bin/Firmware/* ./${{ steps.date.outputs.date }} -r
- name: Upload Firmware to Artifacts - name: Upload Firmware to Artifacts
uses: actions/upload-artifact@main uses: actions/upload-artifact@main
@ -307,93 +310,41 @@ jobs:
echo SP_LEGACY_VDI=$(echo $SP_LEGACY_VDI) >> $GITHUB_ENV echo SP_LEGACY_VDI=$(echo $SP_LEGACY_VDI) >> $GITHUB_ENV
echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV
- name: 1 Upload SP_UEFI_IMG_GZ to SharePoint - name: 1 Upload SP_UEFI_VMDK to SharePoint
uses: xopenwrt/share-point-uploader@v2.3 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
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 - name: 2 Upload SP_UEFI_VMDK to SharePoint
uses: xopenwrt/share-point-uploader@v2.3 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
sp_file_name: ${{ env.SP_UEFI_VMDK }}
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
# - 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: 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 - name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint
uses: xopenwrt/share-point-uploader@v2.3 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
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 - name: 6 Upload SP_LEGACY_VMDK to SharePoint
uses: xopenwrt/share-point-uploader@v2.3 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
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 - name: Delete VM Disk File
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled() if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()

113
.github/workflows/X-x86_64_Y.yml vendored
View File

@ -250,6 +250,9 @@ jobs:
cd openwrt cd openwrt
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
Firmware_Diy_End Firmware_Diy_End
cd ..
mkdir ${{ steps.date.outputs.date }}
cp openwrt/bin/Firmware/* ./${{ steps.date.outputs.date }} -r
- name: Upload Firmware to Artifacts - name: Upload Firmware to Artifacts
uses: actions/upload-artifact@main uses: actions/upload-artifact@main
@ -302,93 +305,41 @@ jobs:
echo SP_LEGACY_VDI=$(echo $SP_LEGACY_VDI) >> $GITHUB_ENV echo SP_LEGACY_VDI=$(echo $SP_LEGACY_VDI) >> $GITHUB_ENV
echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV
- name: 1 Upload SP_UEFI_IMG_GZ to SharePoint - name: 1 Upload SP_UEFI_VMDK to SharePoint
uses: xopenwrt/share-point-uploader@v2.3 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
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 - name: 2 Upload SP_UEFI_VMDK to SharePoint
uses: xopenwrt/share-point-uploader@v2.3 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
sp_file_name: ${{ env.SP_UEFI_VMDK }}
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
# - 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: 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 - name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint
uses: xopenwrt/share-point-uploader@v2.3 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
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 - name: 6 Upload SP_LEGACY_VMDK to SharePoint
uses: xopenwrt/share-point-uploader@v2.3 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
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 - name: Delete VM Disk File
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled() if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()

11
.github/workflows/X-x86_64_Z.yml vendored
View File

@ -248,6 +248,9 @@ jobs:
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
Firmware_Diy_End Firmware_Diy_End
ls bin/Firmware ls bin/Firmware
cd ..
mkdir ${{ steps.date.outputs.date }}
cp openwrt/bin/Firmware/* ./${{ steps.date.outputs.date }} -r
- name: Upload Firmware to Artifacts - name: Upload Firmware to Artifacts
uses: actions/upload-artifact@main uses: actions/upload-artifact@main
@ -301,7 +304,7 @@ jobs:
echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV
- name: 1 Upload SP_UEFI_VMDK to SharePoint - name: 1 Upload SP_UEFI_VMDK to SharePoint
uses: koraykoska/s3-upload-github-action@master uses: xopenwrt/s3-upload-github-action@master
env: env:
FILE: ./openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }} FILE: ./openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
S3_ENDPOINT: 's3.openwrt.115115.xyz' S3_ENDPOINT: 's3.openwrt.115115.xyz'
@ -310,7 +313,7 @@ jobs:
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
- name: 2 Upload SP_UEFI_VMDK to SharePoint - name: 2 Upload SP_UEFI_VMDK to SharePoint
uses: koraykoska/s3-upload-github-action@master uses: xopenwrt/s3-upload-github-action@master
env: env:
FILE: ./openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }} FILE: ./openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
S3_ENDPOINT: 's3.openwrt.115115.xyz' S3_ENDPOINT: 's3.openwrt.115115.xyz'
@ -341,7 +344,7 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }} # file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }}
- name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint - name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint
uses: koraykoska/s3-upload-github-action@master uses: xopenwrt/s3-upload-github-action@master
env: env:
FILE: ./openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }} FILE: ./openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
S3_ENDPOINT: 's3.openwrt.115115.xyz' S3_ENDPOINT: 's3.openwrt.115115.xyz'
@ -350,7 +353,7 @@ jobs:
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
- name: 6 Upload SP_LEGACY_VMDK to SharePoint - name: 6 Upload SP_LEGACY_VMDK to SharePoint
uses: koraykoska/s3-upload-github-action@master uses: xopenwrt/s3-upload-github-action@master
env: env:
FILE: ./openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }} FILE: ./openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
S3_ENDPOINT: 's3.openwrt.115115.xyz' S3_ENDPOINT: 's3.openwrt.115115.xyz'