Compare commits

..
Author SHA1 Message Date
xopenwrt caf11ba27e fix sharepoint uploader 2025-11-25 09:55:51 +08:00
xopenwrt 2e53d1b1f1 update golang version 2025-11-25 00:14:07 +08:00
xopenwrt de3b57e64e fix 2025-11-22 21:58:53 +08:00
xopenwrt c43892ad94 test 2025-11-22 19:38:19 +08:00
7 changed files with 56 additions and 54 deletions
+8 -8
View File
@@ -256,7 +256,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_IMG_GZ to SharePoint - name: 1 Upload SP_UEFI_IMG_GZ to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -267,7 +267,7 @@ jobs:
file: openwrt/bin/Firmware/${{ 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: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -278,7 +278,7 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }} file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
# - name: 3 Upload SP_UEFI_VDI to SharePoint # - name: 3 Upload SP_UEFI_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -289,7 +289,7 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
# - name: 4 Upload SP_UEFI_VHDX to SharePoint # - name: 4 Upload SP_UEFI_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -300,7 +300,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: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -311,7 +311,7 @@ jobs:
file: openwrt/bin/Firmware/${{ 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: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -322,7 +322,7 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }} file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
# - name: 7 Upload SP_LEGACY_VDI to SharePoint # - name: 7 Upload SP_LEGACY_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -333,7 +333,7 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}
# - name: 8 Upload SP_LEGACY_VHDX to SharePoint # - name: 8 Upload SP_LEGACY_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
+9 -9
View File
@@ -180,7 +180,7 @@ jobs:
./scripts/feeds uninstall luci-theme-argon ./scripts/feeds uninstall luci-theme-argon
# Update golang to 1.22 for xray-core build # Update golang to 1.22 for xray-core build
rm -rf feeds/packages/lang/golang rm -rf feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile # sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug #fix dockerd bug
@@ -308,7 +308,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_IMG_GZ to SharePoint - name: 1 Upload SP_UEFI_IMG_GZ to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -319,7 +319,7 @@ jobs:
file: openwrt/bin/Firmware/${{ 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: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -330,7 +330,7 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }} file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
# - name: 3 Upload SP_UEFI_VDI to SharePoint # - name: 3 Upload SP_UEFI_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -341,7 +341,7 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
# - name: 4 Upload SP_UEFI_VHDX to SharePoint # - name: 4 Upload SP_UEFI_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -352,7 +352,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: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -363,7 +363,7 @@ jobs:
file: openwrt/bin/Firmware/${{ 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: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -374,7 +374,7 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }} file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
# - name: 7 Upload SP_LEGACY_VDI to SharePoint # - name: 7 Upload SP_LEGACY_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -385,7 +385,7 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}
# - name: 8 Upload SP_LEGACY_VHDX to SharePoint # - name: 8 Upload SP_LEGACY_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
+9 -9
View File
@@ -170,7 +170,7 @@ jobs:
./scripts/feeds uninstall luci-theme-argon ./scripts/feeds uninstall luci-theme-argon
# Update golang to 1.22 for xray-core build # Update golang to 1.22 for xray-core build
rm -rf feeds/packages/lang/golang rm -rf feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile # sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug #fix dockerd bug
@@ -299,7 +299,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_IMG_GZ to SharePoint - name: 1 Upload SP_UEFI_IMG_GZ to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -310,7 +310,7 @@ jobs:
file: openwrt/bin/Firmware/${{ 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: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -321,7 +321,7 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }} file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
# - name: 3 Upload SP_UEFI_VDI to SharePoint # - name: 3 Upload SP_UEFI_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -332,7 +332,7 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
# - name: 4 Upload SP_UEFI_VHDX to SharePoint # - name: 4 Upload SP_UEFI_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -343,7 +343,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: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -354,7 +354,7 @@ jobs:
file: openwrt/bin/Firmware/${{ 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: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -365,7 +365,7 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }} file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
# - name: 7 Upload SP_LEGACY_VDI to SharePoint # - name: 7 Upload SP_LEGACY_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -376,7 +376,7 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}
# - name: 8 Upload SP_LEGACY_VHDX to SharePoint # - name: 8 Upload SP_LEGACY_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
+9 -9
View File
@@ -177,7 +177,7 @@ jobs:
./scripts/feeds uninstall luci-theme-argon ./scripts/feeds uninstall luci-theme-argon
# Update golang to 1.22 for xray-core build # Update golang to 1.22 for xray-core build
rm -rf feeds/packages/lang/golang rm -rf feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile # sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug #fix dockerd bug
@@ -303,7 +303,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_IMG_GZ to SharePoint - name: 1 Upload SP_UEFI_IMG_GZ to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -314,7 +314,7 @@ jobs:
file: openwrt/bin/Firmware/${{ 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: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -325,7 +325,7 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }} file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
# - name: 3 Upload SP_UEFI_VDI to SharePoint # - name: 3 Upload SP_UEFI_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -336,7 +336,7 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
# - name: 4 Upload SP_UEFI_VHDX to SharePoint # - name: 4 Upload SP_UEFI_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -347,7 +347,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: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -358,7 +358,7 @@ jobs:
file: openwrt/bin/Firmware/${{ 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: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -369,7 +369,7 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }} file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
# - name: 7 Upload SP_LEGACY_VDI to SharePoint # - name: 7 Upload SP_LEGACY_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -380,7 +380,7 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}
# - name: 8 Upload SP_LEGACY_VHDX to SharePoint # - name: 8 Upload SP_LEGACY_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
+11 -9
View File
@@ -175,7 +175,7 @@ jobs:
./scripts/feeds uninstall luci-theme-argon ./scripts/feeds uninstall luci-theme-argon
# Update golang to 1.22 for xray-core build # Update golang to 1.22 for xray-core build
rm -rf feeds/packages/lang/golang rm -rf feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile # sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug #fix dockerd bug
@@ -247,6 +247,7 @@ 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
ls bin/Firmware
- name: Upload Firmware to Artifacts - name: Upload Firmware to Artifacts
uses: actions/upload-artifact@main uses: actions/upload-artifact@main
@@ -300,7 +301,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_IMG_GZ to SharePoint - name: 1 Upload SP_UEFI_IMG_GZ to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -311,7 +312,7 @@ jobs:
file: openwrt/bin/Firmware/${{ 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: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -322,7 +323,7 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }} file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
# - name: 3 Upload SP_UEFI_VDI to SharePoint # - name: 3 Upload SP_UEFI_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -333,7 +334,7 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
# - name: 4 Upload SP_UEFI_VHDX to SharePoint # - name: 4 Upload SP_UEFI_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -344,7 +345,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: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -355,7 +356,7 @@ jobs:
file: openwrt/bin/Firmware/${{ 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: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -366,7 +367,7 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }} file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
# - name: 7 Upload SP_LEGACY_VDI to SharePoint # - name: 7 Upload SP_LEGACY_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -377,7 +378,7 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}
# - name: 8 Upload SP_LEGACY_VHDX to SharePoint # - name: 8 Upload SP_LEGACY_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -391,6 +392,7 @@ jobs:
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled() if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
run: | run: |
rm openwrt/bin/Firmware/AutoBuild-*.v* -rf rm openwrt/bin/Firmware/AutoBuild-*.v* -rf
ls openwrt/bin/Firmware
- name: Upload Firmware to Github Release - name: Upload Firmware to Github Release
uses: svenstaro/upload-release-action@v2 uses: svenstaro/upload-release-action@v2
+9 -9
View File
@@ -166,7 +166,7 @@ jobs:
./scripts/feeds uninstall luci-theme-argon ./scripts/feeds uninstall luci-theme-argon
# Update golang to 1.22 for xray-core build # Update golang to 1.22 for xray-core build
rm -rf feeds/packages/lang/golang rm -rf feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile # sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug #fix dockerd bug
@@ -291,7 +291,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_IMG_GZ to SharePoint - name: 1 Upload SP_UEFI_IMG_GZ to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -302,7 +302,7 @@ jobs:
file: openwrt/bin/Firmware/${{ 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: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -313,7 +313,7 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }} file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
# - name: 3 Upload SP_UEFI_VDI to SharePoint # - name: 3 Upload SP_UEFI_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -324,7 +324,7 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
# - name: 4 Upload SP_UEFI_VHDX to SharePoint # - name: 4 Upload SP_UEFI_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -335,7 +335,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: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -346,7 +346,7 @@ jobs:
file: openwrt/bin/Firmware/${{ 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: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -357,7 +357,7 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }} file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
# - name: 7 Upload SP_LEGACY_VDI to SharePoint # - name: 7 Upload SP_LEGACY_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
@@ -368,7 +368,7 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}
# - name: 8 Upload SP_LEGACY_VHDX to SharePoint # - name: 8 Upload SP_LEGACY_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.2
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
+1 -1
View File
@@ -166,7 +166,7 @@ jobs:
./scripts/feeds uninstall luci-theme-argon ./scripts/feeds uninstall luci-theme-argon
# Update golang to 1.22 for xray-core build # Update golang to 1.22 for xray-core build
rm -rf feeds/packages/lang/golang rm -rf feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile # sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug #fix dockerd bug