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:master
Branches Tags
xinb:master
xinb:dev
xinb:v2026-01-13
xinb:v2025-12-04
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:v2025-07-20
Branches Tags
xinb:master
xinb:dev
xinb:v2026-01-13
xinb:v2025-12-04
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

No commits in common. "master" and "v2025-07-20" have entirely different histories.
master ... v2025-07-2

11 changed files with 249 additions and 149 deletions
Show Stats Expand all files Collapse all files

16
.github/workflows/X-x86_64_Test.yml vendored
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: xopenwrt/share-point-uploader@v2.3 uses: su-dont/share-point-uploader@v2.1
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: xopenwrt/share-point-uploader@v2.3 uses: su-dont/share-point-uploader@v2.1
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: xopenwrt/share-point-uploader@v2.3 # uses: su-dont/share-point-uploader@v2.1
# 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: xopenwrt/share-point-uploader@v2.3 # uses: su-dont/share-point-uploader@v2.1
# 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: xopenwrt/share-point-uploader@v2.3 uses: su-dont/share-point-uploader@v2.1
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: xopenwrt/share-point-uploader@v2.3 uses: su-dont/share-point-uploader@v2.1
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: xopenwrt/share-point-uploader@v2.3 # uses: su-dont/share-point-uploader@v2.1
# 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: xopenwrt/share-point-uploader@v2.3 # uses: su-dont/share-point-uploader@v2.1
# 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

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

@ -72,6 +72,7 @@ jobs:
echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV
if [ "${{ env.DELETE_USELESS_FILES }}" == true ] if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
then then
docker rmi node:18 node:20 node:22 node:18-alpine node:20-alpine node:22-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest ubuntu:20.04 debian:10 debian:11
sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
sudo -E apt-get -y autoremove --purge sudo -E apt-get -y autoremove --purge
sudo -E apt-get clean sudo -E apt-get clean
@ -180,7 +181,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 25.x feeds/packages/lang/golang git clone https://github.com/sbwml/packages_lang_golang -b 22.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
@ -255,9 +256,6 @@ 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
@ -310,41 +308,93 @@ 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_VMDK to SharePoint - name: 1 Upload SP_UEFI_IMG_GZ to SharePoint
uses: xopenwrt/s3-upload-github-action@master uses: su-dont/share-point-uploader@v2.1
env: if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_IMG_GZ }} with:
S3_ENDPOINT: 's3.openwrt.115115.xyz' sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
S3_BUCKET: ${{ secrets.S3_BUCKET }} sp_username: ${{ secrets.USERNAME }}
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }} sp_password: ${{ secrets.PASSWORD }}
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }} 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 - name: 2 Upload SP_UEFI_VMDK to SharePoint
uses: xopenwrt/s3-upload-github-action@master uses: su-dont/share-point-uploader@v2.1
env: if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_VMDK }} with:
S3_ENDPOINT: 's3.openwrt.115115.xyz' sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
S3_BUCKET: ${{ secrets.S3_BUCKET }} sp_username: ${{ secrets.USERNAME }}
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }} sp_password: ${{ secrets.PASSWORD }}
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }} 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: 3 Upload SP_UEFI_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1
# 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: su-dont/share-point-uploader@v2.1
# 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/s3-upload-github-action@master uses: su-dont/share-point-uploader@v2.1
env: if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_IMG_GZ }} with:
S3_ENDPOINT: 's3.openwrt.115115.xyz' sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
S3_BUCKET: ${{ secrets.S3_BUCKET }} sp_username: ${{ secrets.USERNAME }}
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }} sp_password: ${{ secrets.PASSWORD }}
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }} 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 - name: 6 Upload SP_LEGACY_VMDK to SharePoint
uses: xopenwrt/s3-upload-github-action@master uses: su-dont/share-point-uploader@v2.1
env: if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_VMDK }} with:
S3_ENDPOINT: 's3.openwrt.115115.xyz' sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
S3_BUCKET: ${{ secrets.S3_BUCKET }} sp_username: ${{ secrets.USERNAME }}
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }} sp_password: ${{ secrets.PASSWORD }}
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }} 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: su-dont/share-point-uploader@v2.1
# 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: su-dont/share-point-uploader@v2.1
# 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()

18
.github/workflows/X-x86_64_X_Mine.yml vendored
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 25.x feeds/packages/lang/golang git clone https://github.com/sbwml/packages_lang_golang -b 22.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: xopenwrt/share-point-uploader@v2.3 uses: su-dont/share-point-uploader@v2.1
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: xopenwrt/share-point-uploader@v2.3 uses: su-dont/share-point-uploader@v2.1
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: xopenwrt/share-point-uploader@v2.3 # uses: su-dont/share-point-uploader@v2.1
# 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: xopenwrt/share-point-uploader@v2.3 # uses: su-dont/share-point-uploader@v2.1
# 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: xopenwrt/share-point-uploader@v2.3 uses: su-dont/share-point-uploader@v2.1
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: xopenwrt/share-point-uploader@v2.3 uses: su-dont/share-point-uploader@v2.1
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: xopenwrt/share-point-uploader@v2.3 # uses: su-dont/share-point-uploader@v2.1
# 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: xopenwrt/share-point-uploader@v2.3 # uses: su-dont/share-point-uploader@v2.1
# 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

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

@ -149,6 +149,7 @@ jobs:
sudo chown $USER:$GROUPS /workdir sudo chown $USER:$GROUPS /workdir
if [ "${{ env.DELETE_USELESS_FILES }}" == true ] if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
then then
docker rmi node:18 node:20 node:22 node:18-alpine node:20-alpine node:22-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest ubuntu:20.04 debian:10 debian:11
sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
sudo -E apt-get -y autoremove --purge sudo -E apt-get -y autoremove --purge
sudo -E apt-get clean sudo -E apt-get clean
@ -177,7 +178,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 25.x feeds/packages/lang/golang git clone https://github.com/sbwml/packages_lang_golang -b 22.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
@ -250,9 +251,6 @@ 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
@ -305,41 +303,93 @@ 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_VMDK to SharePoint - name: 1 Upload SP_UEFI_IMG_GZ to SharePoint
uses: xopenwrt/s3-upload-github-action@master uses: su-dont/share-point-uploader@v2.1
env: if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_IMG_GZ }} with:
S3_ENDPOINT: 's3.openwrt.115115.xyz' sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
S3_BUCKET: ${{ secrets.S3_BUCKET }} sp_username: ${{ secrets.USERNAME }}
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }} sp_password: ${{ secrets.PASSWORD }}
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }} 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 - name: 2 Upload SP_UEFI_VMDK to SharePoint
uses: xopenwrt/s3-upload-github-action@master uses: su-dont/share-point-uploader@v2.1
env: if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_VMDK }} with:
S3_ENDPOINT: 's3.openwrt.115115.xyz' sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
S3_BUCKET: ${{ secrets.S3_BUCKET }} sp_username: ${{ secrets.USERNAME }}
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }} sp_password: ${{ secrets.PASSWORD }}
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }} 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: 3 Upload SP_UEFI_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1
# 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: su-dont/share-point-uploader@v2.1
# 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/s3-upload-github-action@master uses: su-dont/share-point-uploader@v2.1
env: if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_IMG_GZ }} with:
S3_ENDPOINT: 's3.openwrt.115115.xyz' sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
S3_BUCKET: ${{ secrets.S3_BUCKET }} sp_username: ${{ secrets.USERNAME }}
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }} sp_password: ${{ secrets.PASSWORD }}
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }} 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 - name: 6 Upload SP_LEGACY_VMDK to SharePoint
uses: xopenwrt/s3-upload-github-action@master uses: su-dont/share-point-uploader@v2.1
env: if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_VMDK }} with:
S3_ENDPOINT: 's3.openwrt.115115.xyz' sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
S3_BUCKET: ${{ secrets.S3_BUCKET }} sp_username: ${{ secrets.USERNAME }}
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }} sp_password: ${{ secrets.PASSWORD }}
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }} 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: su-dont/share-point-uploader@v2.1
# 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: su-dont/share-point-uploader@v2.1
# 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()

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

@ -147,6 +147,7 @@ jobs:
if [ "${{ env.DELETE_USELESS_FILES }}" == true ] if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
then then
docker images docker images
docker rmi node:18 node:20 node:22 node:18-alpine node:20-alpine node:22-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest ubuntu:20.04 debian:10 debian:11
sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
sudo -E apt-get -y autoremove --purge sudo -E apt-get -y autoremove --purge
sudo -E apt-get clean sudo -E apt-get clean
@ -175,7 +176,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 25.x feeds/packages/lang/golang git clone https://github.com/sbwml/packages_lang_golang -b 22.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,10 +248,6 @@ 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
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
@ -303,26 +300,30 @@ 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_VMDK to SharePoint - name: 1 Upload SP_UEFI_IMG_GZ to SharePoint
uses: xopenwrt/s3-upload-github-action@master uses: su-dont/share-point-uploader@v2.1
env: if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_IMG_GZ }} with:
S3_ENDPOINT: 's3.openwrt.115115.xyz' sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
S3_BUCKET: ${{ secrets.S3_BUCKET }} sp_username: ${{ secrets.USERNAME }}
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }} sp_password: ${{ secrets.PASSWORD }}
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }} 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 - name: 2 Upload SP_UEFI_VMDK to SharePoint
uses: xopenwrt/s3-upload-github-action@master uses: su-dont/share-point-uploader@v2.1
env: if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
FILE: ./${{ steps.date.outputs.date }}e/${{ env.SP_UEFI_VMDK }} with:
S3_ENDPOINT: 's3.openwrt.115115.xyz' sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
S3_BUCKET: ${{ secrets.S3_BUCKET }} sp_username: ${{ secrets.USERNAME }}
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }} sp_password: ${{ secrets.PASSWORD }}
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }} 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: 3 Upload SP_UEFI_VDI to SharePoint # - name: 3 Upload SP_UEFI_VDI to SharePoint
# uses: xopenwrt/share-point-uploader@v2.3 # uses: su-dont/share-point-uploader@v2.1
# 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: xopenwrt/share-point-uploader@v2.3 # uses: su-dont/share-point-uploader@v2.1
# 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,25 +345,29 @@ 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: xopenwrt/s3-upload-github-action@master uses: su-dont/share-point-uploader@v2.1
env: if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_IMG_GZ }} with:
S3_ENDPOINT: 's3.openwrt.115115.xyz' sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
S3_BUCKET: ${{ secrets.S3_BUCKET }} sp_username: ${{ secrets.USERNAME }}
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }} sp_password: ${{ secrets.PASSWORD }}
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }} 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 - name: 6 Upload SP_LEGACY_VMDK to SharePoint
uses: xopenwrt/s3-upload-github-action@master uses: su-dont/share-point-uploader@v2.1
env: if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_VMDK }} with:
S3_ENDPOINT: 's3.openwrt.115115.xyz' sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
S3_BUCKET: ${{ secrets.S3_BUCKET }} sp_username: ${{ secrets.USERNAME }}
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }} sp_password: ${{ secrets.PASSWORD }}
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }} 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 # - name: 7 Upload SP_LEGACY_VDI to SharePoint
# uses: xopenwrt/share-point-uploader@v2.3 # uses: su-dont/share-point-uploader@v2.1
# 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
@ -373,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: xopenwrt/share-point-uploader@v2.3 # uses: su-dont/share-point-uploader@v2.1
# 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
@ -387,7 +392,6 @@ 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

18
.github/workflows/X-x86_64_Z_Mine.yml vendored
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 25.x feeds/packages/lang/golang git clone https://github.com/sbwml/packages_lang_golang -b 22.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: xopenwrt/share-point-uploader@v2.3 uses: su-dont/share-point-uploader@v2.1
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: xopenwrt/share-point-uploader@v2.3 uses: su-dont/share-point-uploader@v2.1
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: xopenwrt/share-point-uploader@v2.3 # uses: su-dont/share-point-uploader@v2.1
# 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: xopenwrt/share-point-uploader@v2.3 # uses: su-dont/share-point-uploader@v2.1
# 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: xopenwrt/share-point-uploader@v2.3 uses: su-dont/share-point-uploader@v2.1
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: xopenwrt/share-point-uploader@v2.3 uses: su-dont/share-point-uploader@v2.1
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: xopenwrt/share-point-uploader@v2.3 # uses: su-dont/share-point-uploader@v2.1
# 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: xopenwrt/share-point-uploader@v2.3 # uses: su-dont/share-point-uploader@v2.1
# 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

2
.github/workflows/X-x86_64_Z_Mine_home.yml vendored
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 25.x feeds/packages/lang/golang git clone https://github.com/sbwml/packages_lang_golang -b 22.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

2
Scripts/AutoBuild_DiyScript.sh
View File

@ -123,7 +123,7 @@ EOF
sed -i -- 's:/bin/ash:'/bin/bash':g' ${BASE_FILES}/etc/passwd sed -i -- 's:/bin/ash:'/bin/bash':g' ${BASE_FILES}/etc/passwd
#sed -i "s?6.0?5.19?g" ${WORK}/target/linux/x86/Makefile #sed -i "s?6.0?5.19?g" ${WORK}/target/linux/x86/Makefile
# patch < ${CustomFiles}/Patches/upgrade_intel_igpu_drv.patch -p1 -d ${WORK} # patch < ${CustomFiles}/Patches/upgrade_intel_igpu_drv.patch -p1 -d ${WORK}
# patch < ${CustomFiles}/Patches/fix_mac80211.patch -p1 -d ${WORK} patch < ${CustomFiles}/Patches/fix_mac80211.patch -p1 -d ${WORK}
#fix hostapd #fix hostapd
sed -i "s/\#CONFIG_AP/CONFIG_AP/g" ${WORK}/package/network/services/hostapd/files/wpa* sed -i "s/\#CONFIG_AP/CONFIG_AP/g" ${WORK}/package/network/services/hostapd/files/wpa*
;; ;;

5
Scripts/AutoBuild_Function.sh
View File

@ -23,11 +23,8 @@ Firmware_Diy_Before() {
fi fi
case "${OP_AUTHOR}/${OP_REPO}" in case "${OP_AUTHOR}/${OP_REPO}" in
coolsnowwolf/lede) coolsnowwolf/lede)
# Version_File=package/lean/default-settings/files/zzz-default-settings
# zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})"
Version_File=package/lean/default-settings/files/zzz-default-settings Version_File=package/lean/default-settings/files/zzz-default-settings
Version_Raw=$(cat package/lean/default-settings/files/zzz-default-settings | grep DISTRIB_REVISION) zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})"
zzz_Default_Version="$(echo $Version_Raw | egrep -o "R[0-9]+\.[0-9]+\.[0-9]+")"
OP_VERSION="${zzz_Default_Version}-${Compile_Date}" OP_VERSION="${zzz_Default_Version}-${Compile_Date}"
;; ;;
immortalwrt/immortalwrt) immortalwrt/immortalwrt)

3
Scripts/AutoBuild_Getenv.sh
View File

@ -17,8 +17,7 @@ df -h
echo "------------------------------- IP Address Info ------------------------------" echo "------------------------------- IP Address Info ------------------------------"
IP=`curl ip.115115.xyz -s` IP=`curl ip.115115.xyz -s`
curl ip.115115.xyz -s curl ip.115115.xyz -s
# curl -s https://searchplugin.csdn.net/api/v1/ip/get?ip=${IP} | jq -r .data.address curl -s https://searchplugin.csdn.net/api/v1/ip/get?ip=${IP} | jq -r .data.address
curl -s https://api.vore.top/api/IPdata?ip=${IP} | jq -r .adcode.o
} }
Get_Release_Info() { Get_Release_Info() {