xinb/X-OpenWrt
1
0
Fork 0
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git synced 2026-09-27 15:24:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: xinb/X-OpenWrt:v2025-11-25
Branches Tags
xinb/X-OpenWrt:master xinb/X-OpenWrt:ai xinb/X-OpenWrt:dev
xinb/X-OpenWrt:v2026-09-03 xinb/X-OpenWrt:v2026-08-30 xinb/X-OpenWrt:v2026-08-09 xinb/X-OpenWrt:v2026-06-28 xinb/X-OpenWrt:v2026-06-14 xinb/X-OpenWrt:v2026-06-13 xinb/X-OpenWrt:v2026-06-12 xinb/X-OpenWrt:v2026-06-11 xinb/X-OpenWrt:v2026-01-13 xinb/X-OpenWrt:v2025-12-04 xinb/X-OpenWrt:v2025-11-26 xinb/X-OpenWrt:v2025-11-25 xinb/X-OpenWrt:v2025-11-24 xinb/X-OpenWrt:v2025-11-22 xinb/X-OpenWrt:v2025-07-20 xinb/X-OpenWrt:v2025-07-21 xinb/X-OpenWrt:v2024-12-12 xinb/X-OpenWrt:v2024-12-08 xinb/X-OpenWrt:v2024-12-09 xinb/X-OpenWrt:v2024-12-07 xinb/X-OpenWrt:v2024-12-05 xinb/X-OpenWrt:v2024-12-06 xinb/X-OpenWrt:v2024-09-22 xinb/X-OpenWrt:v2024-06-16 xinb/X-OpenWrt:v2024-06-12 xinb/X-OpenWrt:v2024-06-04 xinb/X-OpenWrt:v2024-05-21 xinb/X-OpenWrt:v2024-04-17 xinb/X-OpenWrt:v2024-03-04 xinb/X-OpenWrt:v2024-03-03 xinb/X-OpenWrt:v2024-03-02 xinb/X-OpenWrt:v2024-01-19 xinb/X-OpenWrt:AutoUpdate_old xinb/X-OpenWrt:AutoUpdate
..
compare: xinb/X-OpenWrt:v2026-06-13
Branches Tags
xinb/X-OpenWrt:master xinb/X-OpenWrt:ai xinb/X-OpenWrt:dev
xinb/X-OpenWrt:v2026-09-03 xinb/X-OpenWrt:v2026-08-30 xinb/X-OpenWrt:v2026-08-09 xinb/X-OpenWrt:v2026-06-28 xinb/X-OpenWrt:v2026-06-14 xinb/X-OpenWrt:v2026-06-13 xinb/X-OpenWrt:v2026-06-12 xinb/X-OpenWrt:v2026-06-11 xinb/X-OpenWrt:v2026-01-13 xinb/X-OpenWrt:v2025-12-04 xinb/X-OpenWrt:v2025-11-26 xinb/X-OpenWrt:v2025-11-25 xinb/X-OpenWrt:v2025-11-24 xinb/X-OpenWrt:v2025-11-22 xinb/X-OpenWrt:v2025-07-20 xinb/X-OpenWrt:v2025-07-21 xinb/X-OpenWrt:v2024-12-12 xinb/X-OpenWrt:v2024-12-08 xinb/X-OpenWrt:v2024-12-09 xinb/X-OpenWrt:v2024-12-07 xinb/X-OpenWrt:v2024-12-05 xinb/X-OpenWrt:v2024-12-06 xinb/X-OpenWrt:v2024-09-22 xinb/X-OpenWrt:v2024-06-16 xinb/X-OpenWrt:v2024-06-12 xinb/X-OpenWrt:v2024-06-04 xinb/X-OpenWrt:v2024-05-21 xinb/X-OpenWrt:v2024-04-17 xinb/X-OpenWrt:v2024-03-04 xinb/X-OpenWrt:v2024-03-03 xinb/X-OpenWrt:v2024-03-02 xinb/X-OpenWrt:v2024-01-19 xinb/X-OpenWrt:AutoUpdate_old xinb/X-OpenWrt:AutoUpdate
28 Commits
v2025-11-25 .. v2026-06-13
Author SHA1 Message Date
xopenwrt ce4d832d49 fix apt err 2026-06-13 10:18:24 +08:00
xopenwrt c6944feabf sync err fix 2026-06-13 01:07:51 +08:00
xopenwrt 57513cf4f8 update golang 2026-06-12 23:18:48 +08:00
xopenwrt da8ae4c8ef fix bug 2026-06-12 21:42:14 +08:00
xopenwrt 44c434d397 fix passwall 2026-06-12 21:37:32 +08:00
xopenwrt 762d1ecd06 fix passwall 2026-06-11 23:47:24 +08:00
xopenwrt 0e31ac6248 fix 2026-06-11 23:09:31 +08:00
xopenwrt 856ce8b5b5 fix 2026-06-11 22:54:58 +08:00
xopenwrt dc6091db1a fix 2026-06-11 22:46:43 +08:00
xopenwrt daf9fdc776 fix 2026-06-11 22:42:56 +08:00
xopenwrt 54f624a756 fIx 2026-06-11 22:34:16 +08:00
xopenwrt a665e75fa7 fix 2026-06-11 22:20:43 +08:00
xopenwrt c62782c5d0 fix 2026-05-12 00:24:23 +08:00
xopenwrt 8770c61074 fix 2026-05-10 23:52:56 +08:00
xopenwrt 313bebb686 fix 2026-05-10 23:38:47 +08:00
xopenwrt 48675fbfc8 Release New Version 2025-11-27 10:30:50 +08:00
xopenwrt 4e37e8d084 fix action upload 2025-11-26 19:34:44 +08:00
xopenwrt 732b5f3844 Test 2025-11-26 19:17:39 +08:00
xopenwrt d0be16a8cb Test upload 2025-11-26 19:15:12 +08:00
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
xopenwrt 4e0ccaf038 test S3 upload 2025-11-25 19:49:01 +08:00
xopenwrt 5e08d7e060 update uploader 2025-11-25 12:55:09 +08:00
8 changed files with 158 additions and 254 deletions
Expand all files Collapse all files
.github/workflows/X-x86_64_Test.yml
+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: xopenwrt/share-point-uploader@v2.2 uses: xopenwrt/share-point-uploader@v2.3
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.2 uses: xopenwrt/share-point-uploader@v2.3
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.2 # uses: xopenwrt/share-point-uploader@v2.3
# 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.2 # uses: xopenwrt/share-point-uploader@v2.3
# 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.2 uses: xopenwrt/share-point-uploader@v2.3
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.2 uses: xopenwrt/share-point-uploader@v2.3
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.2 # uses: xopenwrt/share-point-uploader@v2.3
# 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.2 # uses: xopenwrt/share-point-uploader@v2.3
# 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
.github/workflows/X-x86_64_X.yml
+42 -89
View File
@@ -80,11 +80,11 @@ jobs:
- name: Maximize Build Space - name: Maximize Build Space
uses: easimon/maximize-build-space@master uses: easimon/maximize-build-space@master
with: with:
root-reserve-mb: 3500 root-reserve-mb: 4096
swap-size-mb: 100 swap-size-mb: 512
temp-reserve-mb: 1024
remove-dotnet: 'true' remove-dotnet: 'true'
remove-android: 'true' remove-android: 'true'
remove-haskell: 'true'
- name: Checkout - name: Checkout
uses: actions/checkout@main uses: actions/checkout@main
@@ -151,7 +151,7 @@ jobs:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
run: | run: |
sudo -E apt-get update sudo -E apt-get update
sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync sudo -E apt-get -y install build-essential cmake binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync
sudo -E apt-get -y install llvm clang sudo -E apt-get -y install llvm clang
sudo timedatectl set-timezone "Asia/Shanghai" sudo timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir sudo mkdir -p /workdir
@@ -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 25.x feeds/packages/lang/golang git clone https://github.com/sbwml/packages_lang_golang -b 26.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
@@ -212,6 +212,8 @@ jobs:
- name: Build OpenWrt - name: Build OpenWrt
run: | run: |
cd openwrt cd openwrt
rm -rf package/feeds/packages/net/{xray-core,v2ray-geodata,sing-box,chinadns-ng,dns2socks,hysteria,ipt2socks,microsocks,naiveproxy,shadowsocks-rust,shadowsocksr-libev,simple-obfs,tcping,v2ray-plugin,xray-plugin,geoview,shadow-tls}
rm -rf package/feeds/luci/applications/luci-app-passwall
rm package/feeds/packages/adguardhome -rf rm package/feeds/packages/adguardhome -rf
rm feeds/packages/net/adguardhome -rf rm feeds/packages/net/adguardhome -rf
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
@@ -255,6 +257,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 +312,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.2 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./${{ steps.date.outputs.date }}/${{ 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.2 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./${{ steps.date.outputs.date }}/${{ 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 - name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint
# uses: xopenwrt/share-point-uploader@v2.2 uses: xopenwrt/s3-upload-github-action@master
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
# with: FILE: ./${{ steps.date.outputs.date }}/${{ 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_UEFI_VDI }}
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
# - name: 4 Upload SP_UEFI_VHDX to SharePoint - name: 6 Upload SP_LEGACY_VMDK to SharePoint
# uses: xopenwrt/share-point-uploader@v2.2 uses: xopenwrt/s3-upload-github-action@master
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
# with: FILE: ./${{ steps.date.outputs.date }}/${{ 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_UEFI_VHDX }}
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }}
- name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint
uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
sp_file_name: ${{ env.SP_LEGACY_IMG_GZ }}
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
- name: 6 Upload SP_LEGACY_VMDK to SharePoint
uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
sp_file_name: ${{ env.SP_LEGACY_VMDK }}
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
# - name: 7 Upload SP_LEGACY_VDI to SharePoint
# uses: xopenwrt/share-point-uploader@v2.2
# 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.2
# 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()
.github/workflows/X-x86_64_X_Mine.yml
+8 -8
View File
@@ -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.2 uses: xopenwrt/share-point-uploader@v2.3
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.2 uses: xopenwrt/share-point-uploader@v2.3
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.2 # uses: xopenwrt/share-point-uploader@v2.3
# 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.2 # uses: xopenwrt/share-point-uploader@v2.3
# 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.2 uses: xopenwrt/share-point-uploader@v2.3
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.2 uses: xopenwrt/share-point-uploader@v2.3
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.2 # uses: xopenwrt/share-point-uploader@v2.3
# 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.2 # uses: xopenwrt/share-point-uploader@v2.3
# 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
.github/workflows/X-x86_64_Y.yml
+41 -88
View File
@@ -65,11 +65,11 @@ jobs:
- name: Maximize Build Space - name: Maximize Build Space
uses: easimon/maximize-build-space@master uses: easimon/maximize-build-space@master
with: with:
root-reserve-mb: 5120 root-reserve-mb: 4096
swap-size-mb: 512 swap-size-mb: 512
temp-reserve-mb: 1024
remove-dotnet: 'true' remove-dotnet: 'true'
remove-android: 'true' remove-android: 'true'
remove-haskell: 'true'
- name: Checkout - name: Checkout
uses: actions/checkout@main uses: actions/checkout@main
@@ -142,7 +142,7 @@ jobs:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
run: | run: |
sudo -E apt-get update sudo -E apt-get update
sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync sudo -E apt-get -y install build-essential cmake binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync
sudo -E apt-get -y install llvm clang sudo -E apt-get -y install llvm clang
sudo timedatectl set-timezone "Asia/Shanghai" sudo timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir sudo mkdir -p /workdir
@@ -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 25.x feeds/packages/lang/golang git clone https://github.com/sbwml/packages_lang_golang -b 26.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
@@ -209,6 +209,8 @@ jobs:
- name: Build OpenWrt - name: Build OpenWrt
run: | run: |
cd openwrt cd openwrt
rm -rf package/feeds/packages/net/{xray-core,v2ray-geodata,sing-box,chinadns-ng,dns2socks,hysteria,ipt2socks,microsocks,naiveproxy,shadowsocks-rust,shadowsocksr-libev,simple-obfs,tcping,v2ray-plugin,xray-plugin,geoview,shadow-tls}
rm -rf package/feeds/luci/applications/luci-app-passwall
rm package/feeds/packages/adguardhome -rf rm package/feeds/packages/adguardhome -rf
rm feeds/packages/net/adguardhome -rf rm feeds/packages/net/adguardhome -rf
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
@@ -250,6 +252,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 +307,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.2 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./${{ steps.date.outputs.date }}/${{ 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.2 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./${{ steps.date.outputs.date }}/${{ 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 - name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint
# uses: xopenwrt/share-point-uploader@v2.2 uses: xopenwrt/s3-upload-github-action@master
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
# with: FILE: ./${{ steps.date.outputs.date }}/${{ 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_UEFI_VDI }}
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
# - name: 4 Upload SP_UEFI_VHDX to SharePoint - name: 6 Upload SP_LEGACY_VMDK to SharePoint
# uses: xopenwrt/share-point-uploader@v2.2 uses: xopenwrt/s3-upload-github-action@master
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
# with: FILE: ./${{ steps.date.outputs.date }}/${{ 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_UEFI_VHDX }}
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }}
- name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint
uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
sp_file_name: ${{ env.SP_LEGACY_IMG_GZ }}
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
- name: 6 Upload SP_LEGACY_VMDK to SharePoint
uses: xopenwrt/share-point-uploader@v2.2
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
sp_file_name: ${{ env.SP_LEGACY_VMDK }}
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
# - name: 7 Upload SP_LEGACY_VDI to SharePoint
# uses: xopenwrt/share-point-uploader@v2.2
# 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.2
# 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()
.github/workflows/X-x86_64_Z.yml
+45 -47
View File
@@ -65,8 +65,9 @@ jobs:
- name: Maximize Build Space - name: Maximize Build Space
uses: easimon/maximize-build-space@master uses: easimon/maximize-build-space@master
with: with:
root-reserve-mb: 5120 root-reserve-mb: 4096
swap-size-mb: 512 swap-size-mb: 512
temp-reserve-mb: 1024
remove-dotnet: 'true' remove-dotnet: 'true'
remove-android: 'true' remove-android: 'true'
@@ -139,7 +140,7 @@ jobs:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
run: | run: |
sudo -E apt-get update sudo -E apt-get update
sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync sudo -E apt-get -y install build-essential cmake binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync
sudo -E apt-get -y install llvm clang sudo -E apt-get -y install llvm clang
sudo timedatectl set-timezone "Asia/Shanghai" sudo timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir sudo mkdir -p /workdir
@@ -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 26.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
@@ -207,6 +208,8 @@ jobs:
- name: Build OpenWrt - name: Build OpenWrt
run: | run: |
cd openwrt cd openwrt
rm -rf package/feeds/packages/net/{xray-core,v2ray-geodata,sing-box,chinadns-ng,dns2socks,hysteria,ipt2socks,microsocks,naiveproxy,shadowsocks-rust,shadowsocksr-libev,simple-obfs,tcping,v2ray-plugin,xray-plugin,geoview,shadow-tls}
rm -rf package/feeds/luci/applications/luci-app-passwall
rm package/feeds/packages/adguardhome -rf rm package/feeds/packages/adguardhome -rf
rm feeds/packages/net/adguardhome -rf rm feeds/packages/net/adguardhome -rf
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
@@ -248,6 +251,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
@@ -300,30 +306,26 @@ 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.2 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./${{ steps.date.outputs.date }}/${{ 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.2 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./${{ steps.date.outputs.date }}e/${{ 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 # - name: 3 Upload SP_UEFI_VDI to SharePoint
# uses: xopenwrt/share-point-uploader@v2.2 # uses: xopenwrt/share-point-uploader@v2.3
# 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
@@ -334,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: xopenwrt/share-point-uploader@v2.2 # uses: xopenwrt/share-point-uploader@v2.3
# 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,30 +346,26 @@ jobs:
# sp_file_name: ${{ env.SP_UEFI_VHDX }} # sp_file_name: ${{ env.SP_UEFI_VHDX }}
# 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.2 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./${{ steps.date.outputs.date }}/${{ 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.2 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./${{ steps.date.outputs.date }}/${{ 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 # - name: 7 Upload SP_LEGACY_VDI to SharePoint
# uses: xopenwrt/share-point-uploader@v2.2 # uses: xopenwrt/share-point-uploader@v2.3
# 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
@@ -378,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.2 # uses: xopenwrt/share-point-uploader@v2.3
# 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
.github/workflows/X-x86_64_Z_Mine.yml
+8 -8
View File
@@ -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.2 uses: xopenwrt/share-point-uploader@v2.3
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.2 uses: xopenwrt/share-point-uploader@v2.3
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.2 # uses: xopenwrt/share-point-uploader@v2.3
# 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.2 # uses: xopenwrt/share-point-uploader@v2.3
# 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.2 uses: xopenwrt/share-point-uploader@v2.3
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.2 uses: xopenwrt/share-point-uploader@v2.3
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.2 # uses: xopenwrt/share-point-uploader@v2.3
# 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.2 # uses: xopenwrt/share-point-uploader@v2.3
# 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
Scripts/AutoBuild_DiyScript.sh
+5 -5
View File
@@ -95,8 +95,8 @@ EOF
# done ; unset x # done ; unset x
patch < ${CustomFiles}/Patches/fix_coremark.patch -p1 -d ${WORK} patch < ${CustomFiles}/Patches/fix_coremark.patch -p1 -d ${WORK}
#patch < ${CustomFiles}/Patches/fix_aria2_auto_create_download_path.patch -p1 -d ${WORK} # patch < ${CustomFiles}/Patches/fix_aria2_auto_create_download_path.patch -p1 -d ${WORK}
patch < ${CustomFiles}/Patches/fix_luci-app-autoreboot-generic.patch -p1 -d ${WORK} # patch < ${CustomFiles}/Patches/fix_luci-app-autoreboot-generic.patch -p1 -d ${WORK}
# delete adguardhome in lede package # delete adguardhome in lede package
# rm package/feeds/packages/net/adguardhome -rf # rm package/feeds/packages/net/adguardhome -rf
@@ -114,9 +114,9 @@ EOF
;; ;;
x86_64) x86_64)
Copy ${CustomFiles}/Depends/cpuset ${BASE_FILES}/bin Copy ${CustomFiles}/Depends/cpuset ${BASE_FILES}/bin
AddPackage git passwall-depends openwrt-passwall-packages xiaorouji main AddPackage git passwall-packages openwrt-passwall-packages Openwrt-Passwall main
AddPackage git passwall-luci openwrt-passwall xiaorouji main AddPackage git passwall-luci openwrt-passwall Openwrt-Passwall main
AddPackage git passwall2-luci openwrt-passwall2 xiaorouji main AddPackage git passwall2-luci openwrt-passwall2 Openwrt-Passwall main
AddPackage git other luci-app-dockerman lisaac master AddPackage git other luci-app-dockerman lisaac master
rm -rf packages/lean/autocore # May Can Delete rm -rf packages/lean/autocore # May Can Delete
AddPackage git lean autocore-modify xopenwrt master AddPackage git lean autocore-modify xopenwrt master