mirror of
https://github.com/xopenwrt/X-OpenWrt-New.git
synced 2026-09-27 07:14:43 +00:00
Compare commits
8
Commits
v2026-06-12
..
dev
| Author | SHA1 | Date | |
|---|---|---|---|
 xopenwrt
|
2638e8eea4 | ||
|
xopenwrt
|
ec6130e594 | ||
|
xopenwrt
|
8a642fcb31 | ||
|
xopenwrt
|
1b6da070d2 | ||
|
xopenwrt
|
110c498e00 | ||
|
xopenwrt
|
4695b0eb6a | ||
|
xopenwrt
|
9dc6c25565 | ||
|
xopenwrt
|
0fe7ed015e |
@@ -216,7 +216,7 @@ jobs:
|
||||
- name: Download Github API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
|
||||
- name: Upload Github API to Release
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
|
||||
|
||||
@@ -216,7 +216,7 @@ jobs:
|
||||
- name: Download Github API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
|
||||
- name: Upload Github API to Release
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
|
||||
|
||||
@@ -216,7 +216,7 @@ jobs:
|
||||
- name: Download Github API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
|
||||
- name: Upload Github API to Release
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
|
||||
|
||||
@@ -215,7 +215,7 @@ jobs:
|
||||
- name: Download Github API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
|
||||
- name: Upload Github API to Release
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
|
||||
|
||||
@@ -216,7 +216,7 @@ jobs:
|
||||
- name: Download Github API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
|
||||
- name: Upload Github API to Release
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
|
||||
|
||||
@@ -216,7 +216,7 @@ jobs:
|
||||
- name: Download Github API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
|
||||
- name: Upload Github API to Release
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
|
||||
|
||||
@@ -216,7 +216,7 @@ jobs:
|
||||
- name: Download Github API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
|
||||
- name: Upload Github API to Release
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
|
||||
|
||||
@@ -216,7 +216,7 @@ jobs:
|
||||
- name: Download Github API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
|
||||
- name: Upload Github API to Release
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
|
||||
|
||||
@@ -30,7 +30,7 @@ jobs:
|
||||
|
||||
- name: Download Github Release API
|
||||
run: |
|
||||
wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
|
||||
- name: Upload API to Github Release
|
||||
uses: svenstaro/upload-release-action@v2
|
||||
|
||||
@@ -136,7 +136,6 @@ jobs:
|
||||
sudo chown $USER:$GROUPS /workdir
|
||||
if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
|
||||
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 -E apt-get -y autoremove --purge
|
||||
sudo -E apt-get clean
|
||||
@@ -221,7 +220,7 @@ jobs:
|
||||
- name: Download Github Release API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
SP_UEFI_IMG_GZ=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.img.gz
|
||||
SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ)
|
||||
SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/}
|
||||
@@ -256,7 +255,7 @@ jobs:
|
||||
echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV
|
||||
|
||||
- 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'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -267,7 +266,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
|
||||
|
||||
- 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'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -278,7 +277,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
|
||||
|
||||
# - 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'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -289,7 +288,7 @@ jobs:
|
||||
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
|
||||
|
||||
# - 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'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -300,7 +299,7 @@ jobs:
|
||||
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }}
|
||||
|
||||
- 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'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -311,7 +310,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
|
||||
|
||||
- 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'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -322,7 +321,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
|
||||
|
||||
# - 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'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -333,7 +332,7 @@ jobs:
|
||||
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}
|
||||
|
||||
# - 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'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
|
||||
@@ -26,6 +26,9 @@ on:
|
||||
Tempoary_FLAG:
|
||||
description: '固件名称后缀 [可选]'
|
||||
default: 'X'
|
||||
Tempoary_Remove_AMDGPU:
|
||||
description: '是否移除AMD GPU驱动'
|
||||
default: 'true'
|
||||
### 结束
|
||||
|
||||
#push:
|
||||
@@ -68,6 +71,7 @@ jobs:
|
||||
echo "::set-output name=date::$(date +'%Y-%m-%d')"
|
||||
echo "Release=${{ github.event.inputs.Release }}" >> $GITHUB_ENV
|
||||
echo "SharePoint=${{ github.event.inputs.SharePoint }}" >> $GITHUB_ENV
|
||||
echo "Tempoary_Remove_AMDGPU=${{ github.event.inputs.Tempoary_Remove_AMDGPU }}" >> $GITHUB_ENV
|
||||
echo "data2=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
|
||||
echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV
|
||||
if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
|
||||
@@ -178,9 +182,9 @@ jobs:
|
||||
./scripts/feeds update -a
|
||||
./scripts/feeds install -a
|
||||
./scripts/feeds uninstall luci-theme-argon
|
||||
# Update golang to 1.22 for xray-core build
|
||||
# Update golang to 1.24 for xray-core build
|
||||
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 24.x feeds/packages/lang/golang
|
||||
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
|
||||
#fix dockerd bug
|
||||
|
||||
@@ -198,6 +202,10 @@ jobs:
|
||||
make defconfig
|
||||
Firmware_Diy_Before
|
||||
rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||
if [ "${{ env.Tempoary_Remove_AMDGPU }}" == true ]
|
||||
then
|
||||
echo "# CONFIG_PACKAGE_kmod-drm-amdgpu is not set" >> .config
|
||||
fi
|
||||
Firmware_Diy_Main
|
||||
Firmware_Diy
|
||||
Firmware_Diy_Other
|
||||
@@ -255,9 +263,6 @@ jobs:
|
||||
cd openwrt
|
||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
|
||||
Firmware_Diy_End
|
||||
cd ..
|
||||
mkdir ${{ steps.date.outputs.date }}
|
||||
cp openwrt/bin/Firmware/* ./${{ steps.date.outputs.date }} -r
|
||||
|
||||
- name: Upload Firmware to Artifacts
|
||||
uses: actions/upload-artifact@main
|
||||
@@ -276,7 +281,7 @@ jobs:
|
||||
- name: Download Github Release API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
SP_UEFI_IMG_GZ=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.img.gz
|
||||
SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ)
|
||||
SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/}
|
||||
@@ -310,41 +315,93 @@ jobs:
|
||||
echo SP_LEGACY_VDI=$(echo $SP_LEGACY_VDI) >> $GITHUB_ENV
|
||||
echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV
|
||||
|
||||
- name: 1 Upload SP_UEFI_VMDK to SharePoint
|
||||
uses: xopenwrt/s3-upload-github-action@master
|
||||
env:
|
||||
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_IMG_GZ }}
|
||||
S3_ENDPOINT: 's3.openwrt.115115.xyz'
|
||||
S3_BUCKET: ${{ secrets.S3_BUCKET }}
|
||||
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
|
||||
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
|
||||
- name: 1 Upload SP_UEFI_IMG_GZ to SharePoint
|
||||
uses: 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_IMG_GZ }}
|
||||
file: openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
|
||||
|
||||
- name: 2 Upload SP_UEFI_VMDK to SharePoint
|
||||
uses: xopenwrt/s3-upload-github-action@master
|
||||
env:
|
||||
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_VMDK }}
|
||||
S3_ENDPOINT: 's3.openwrt.115115.xyz'
|
||||
S3_BUCKET: ${{ secrets.S3_BUCKET }}
|
||||
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
|
||||
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
|
||||
- name: 2 Upload SP_UEFI_VMDK to SharePoint
|
||||
uses: 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_VMDK }}
|
||||
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
|
||||
|
||||
- name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint
|
||||
uses: xopenwrt/s3-upload-github-action@master
|
||||
env:
|
||||
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_IMG_GZ }}
|
||||
S3_ENDPOINT: 's3.openwrt.115115.xyz'
|
||||
S3_BUCKET: ${{ secrets.S3_BUCKET }}
|
||||
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
|
||||
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
|
||||
# - name: 3 Upload SP_UEFI_VDI to SharePoint
|
||||
# uses: 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: 6 Upload SP_LEGACY_VMDK to SharePoint
|
||||
uses: xopenwrt/s3-upload-github-action@master
|
||||
env:
|
||||
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_VMDK }}
|
||||
S3_ENDPOINT: 's3.openwrt.115115.xyz'
|
||||
S3_BUCKET: ${{ secrets.S3_BUCKET }}
|
||||
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
|
||||
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
|
||||
# - name: 4 Upload SP_UEFI_VHDX to SharePoint
|
||||
# uses: 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
|
||||
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_IMG_GZ }}
|
||||
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
|
||||
|
||||
- name: 6 Upload SP_LEGACY_VMDK 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_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
|
||||
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||
|
||||
@@ -26,6 +26,9 @@ on:
|
||||
Tempoary_FLAG:
|
||||
description: '固件名称后缀 [可选]'
|
||||
default: 'X'
|
||||
Tempoary_Remove_AMDGPU:
|
||||
description: '是否移除AMD GPU驱动'
|
||||
default: 'true'
|
||||
### 结束
|
||||
|
||||
#push:
|
||||
@@ -74,6 +77,7 @@ jobs:
|
||||
echo "::set-output name=date::$(date +'%Y-%m-%d')"
|
||||
echo "Release=${{ github.event.inputs.Release }}" >> $GITHUB_ENV
|
||||
echo "SharePoint=${{ github.event.inputs.SharePoint }}" >> $GITHUB_ENV
|
||||
echo "Tempoary_Remove_AMDGPU=${{ github.event.inputs.Tempoary_Remove_AMDGPU }}" >> $GITHUB_ENV
|
||||
echo "data2=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
|
||||
echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV
|
||||
|
||||
@@ -168,9 +172,9 @@ jobs:
|
||||
./scripts/feeds update -a
|
||||
./scripts/feeds install -a
|
||||
./scripts/feeds uninstall luci-theme-argon
|
||||
# Update golang to 1.22 for xray-core build
|
||||
# Update golang to 1.24 for xray-core build
|
||||
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 24.x feeds/packages/lang/golang
|
||||
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
|
||||
#fix dockerd bug
|
||||
|
||||
@@ -188,6 +192,10 @@ jobs:
|
||||
make defconfig
|
||||
Firmware_Diy_Before
|
||||
rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
|
||||
if [ "${{ env.Tempoary_Remove_AMDGPU }}" == true ]
|
||||
then
|
||||
echo "# CONFIG_PACKAGE_kmod-drm-amdgpu is not set" >> .config
|
||||
fi
|
||||
Firmware_Diy_Main
|
||||
Firmware_Diy
|
||||
Firmware_Diy_Other
|
||||
@@ -264,7 +272,7 @@ jobs:
|
||||
- name: Download Github Release API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
SP_UEFI_IMG_GZ=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.img.gz
|
||||
SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ)
|
||||
SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/}
|
||||
@@ -299,7 +307,7 @@ jobs:
|
||||
echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV
|
||||
|
||||
- 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'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -310,7 +318,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
|
||||
|
||||
- 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'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -321,7 +329,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
|
||||
|
||||
# - 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'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -332,7 +340,7 @@ jobs:
|
||||
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
|
||||
|
||||
# - 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'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -343,7 +351,7 @@ jobs:
|
||||
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }}
|
||||
|
||||
- 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'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -354,7 +362,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
|
||||
|
||||
- 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'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -365,7 +373,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
|
||||
|
||||
# - 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'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -376,7 +384,7 @@ jobs:
|
||||
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}
|
||||
|
||||
# - 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'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
|
||||
@@ -175,9 +175,9 @@ jobs:
|
||||
./scripts/feeds update -a
|
||||
./scripts/feeds install -a
|
||||
./scripts/feeds uninstall luci-theme-argon
|
||||
# Update golang to 1.22 for xray-core build
|
||||
# Update golang to 1.24 for xray-core build
|
||||
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 24.x feeds/packages/lang/golang
|
||||
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
|
||||
#fix dockerd bug
|
||||
|
||||
@@ -250,9 +250,6 @@ jobs:
|
||||
cd openwrt
|
||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
|
||||
Firmware_Diy_End
|
||||
cd ..
|
||||
mkdir ${{ steps.date.outputs.date }}
|
||||
cp openwrt/bin/Firmware/* ./${{ steps.date.outputs.date }} -r
|
||||
|
||||
- name: Upload Firmware to Artifacts
|
||||
uses: actions/upload-artifact@main
|
||||
@@ -271,7 +268,7 @@ jobs:
|
||||
- name: Download Github Release API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
SP_UEFI_IMG_GZ=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.img.gz
|
||||
SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ)
|
||||
SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/}
|
||||
@@ -305,41 +302,93 @@ jobs:
|
||||
echo SP_LEGACY_VDI=$(echo $SP_LEGACY_VDI) >> $GITHUB_ENV
|
||||
echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV
|
||||
|
||||
- name: 1 Upload SP_UEFI_VMDK to SharePoint
|
||||
uses: xopenwrt/s3-upload-github-action@master
|
||||
env:
|
||||
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_IMG_GZ }}
|
||||
S3_ENDPOINT: 's3.openwrt.115115.xyz'
|
||||
S3_BUCKET: ${{ secrets.S3_BUCKET }}
|
||||
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
|
||||
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
|
||||
- name: 1 Upload SP_UEFI_IMG_GZ to SharePoint
|
||||
uses: 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_IMG_GZ }}
|
||||
file: openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
|
||||
|
||||
- name: 2 Upload SP_UEFI_VMDK to SharePoint
|
||||
uses: xopenwrt/s3-upload-github-action@master
|
||||
env:
|
||||
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_VMDK }}
|
||||
S3_ENDPOINT: 's3.openwrt.115115.xyz'
|
||||
S3_BUCKET: ${{ secrets.S3_BUCKET }}
|
||||
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
|
||||
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
|
||||
- name: 2 Upload SP_UEFI_VMDK to SharePoint
|
||||
uses: 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_VMDK }}
|
||||
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
|
||||
|
||||
- name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint
|
||||
uses: xopenwrt/s3-upload-github-action@master
|
||||
env:
|
||||
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_IMG_GZ }}
|
||||
S3_ENDPOINT: 's3.openwrt.115115.xyz'
|
||||
S3_BUCKET: ${{ secrets.S3_BUCKET }}
|
||||
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
|
||||
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
|
||||
# - name: 3 Upload SP_UEFI_VDI to SharePoint
|
||||
# uses: 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: 6 Upload SP_LEGACY_VMDK to SharePoint
|
||||
uses: xopenwrt/s3-upload-github-action@master
|
||||
env:
|
||||
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_VMDK }}
|
||||
S3_ENDPOINT: 's3.openwrt.115115.xyz'
|
||||
S3_BUCKET: ${{ secrets.S3_BUCKET }}
|
||||
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
|
||||
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
|
||||
# - name: 4 Upload SP_UEFI_VHDX to SharePoint
|
||||
# uses: 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
|
||||
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_IMG_GZ }}
|
||||
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
|
||||
|
||||
- name: 6 Upload SP_LEGACY_VMDK 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_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
|
||||
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||
|
||||
@@ -65,9 +65,8 @@ jobs:
|
||||
- name: Maximize Build Space
|
||||
uses: easimon/maximize-build-space@master
|
||||
with:
|
||||
root-reserve-mb: 4096
|
||||
root-reserve-mb: 5120
|
||||
swap-size-mb: 512
|
||||
temp-reserve-mb: 1024
|
||||
remove-dotnet: 'true'
|
||||
remove-android: 'true'
|
||||
|
||||
@@ -140,14 +139,13 @@ jobs:
|
||||
DEBIAN_FRONTEND: noninteractive
|
||||
run: |
|
||||
sudo -E apt-get update
|
||||
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 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 llvm clang
|
||||
sudo timedatectl set-timezone "Asia/Shanghai"
|
||||
sudo mkdir -p /workdir
|
||||
sudo chown $USER:$GROUPS /workdir
|
||||
if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
|
||||
then
|
||||
docker images
|
||||
sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
|
||||
sudo -E apt-get -y autoremove --purge
|
||||
sudo -E apt-get clean
|
||||
@@ -174,9 +172,9 @@ jobs:
|
||||
./scripts/feeds update -a
|
||||
./scripts/feeds install -a
|
||||
./scripts/feeds uninstall luci-theme-argon
|
||||
# Update golang to 1.22 for xray-core build
|
||||
# Update golang to 1.24 for xray-core build
|
||||
rm -rf feeds/packages/lang/golang
|
||||
git clone https://github.com/sbwml/packages_lang_golang -b 26.x feeds/packages/lang/golang
|
||||
git clone https://github.com/sbwml/packages_lang_golang -b 24.x feeds/packages/lang/golang
|
||||
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
|
||||
#fix dockerd bug
|
||||
|
||||
@@ -208,8 +206,6 @@ jobs:
|
||||
- name: Build OpenWrt
|
||||
run: |
|
||||
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 feeds/packages/net/adguardhome -rf
|
||||
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
|
||||
@@ -250,10 +246,6 @@ jobs:
|
||||
cd openwrt
|
||||
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
|
||||
Firmware_Diy_End
|
||||
ls bin/Firmware
|
||||
cd ..
|
||||
mkdir ${{ steps.date.outputs.date }}
|
||||
cp openwrt/bin/Firmware/* ./${{ steps.date.outputs.date }} -r
|
||||
|
||||
- name: Upload Firmware to Artifacts
|
||||
uses: actions/upload-artifact@main
|
||||
@@ -272,7 +264,7 @@ jobs:
|
||||
- name: Download Github Release API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
SP_UEFI_IMG_GZ=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.img.gz
|
||||
SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ)
|
||||
SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/}
|
||||
@@ -306,26 +298,30 @@ jobs:
|
||||
echo SP_LEGACY_VDI=$(echo $SP_LEGACY_VDI) >> $GITHUB_ENV
|
||||
echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV
|
||||
|
||||
- name: 1 Upload SP_UEFI_VMDK to SharePoint
|
||||
uses: xopenwrt/s3-upload-github-action@master
|
||||
env:
|
||||
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_IMG_GZ }}
|
||||
S3_ENDPOINT: 's3.openwrt.115115.xyz'
|
||||
S3_BUCKET: ${{ secrets.S3_BUCKET }}
|
||||
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
|
||||
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
|
||||
- name: 1 Upload SP_UEFI_IMG_GZ to SharePoint
|
||||
uses: 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_IMG_GZ }}
|
||||
file: openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
|
||||
|
||||
- name: 2 Upload SP_UEFI_VMDK to SharePoint
|
||||
uses: xopenwrt/s3-upload-github-action@master
|
||||
env:
|
||||
FILE: ./${{ steps.date.outputs.date }}e/${{ env.SP_UEFI_VMDK }}
|
||||
S3_ENDPOINT: 's3.openwrt.115115.xyz'
|
||||
S3_BUCKET: ${{ secrets.S3_BUCKET }}
|
||||
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
|
||||
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
|
||||
- name: 2 Upload SP_UEFI_VMDK to SharePoint
|
||||
uses: 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_VMDK }}
|
||||
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
|
||||
|
||||
# - 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'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -336,7 +332,7 @@ jobs:
|
||||
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
|
||||
|
||||
# - 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'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -346,26 +342,30 @@ jobs:
|
||||
# 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/s3-upload-github-action@master
|
||||
env:
|
||||
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_IMG_GZ }}
|
||||
S3_ENDPOINT: 's3.openwrt.115115.xyz'
|
||||
S3_BUCKET: ${{ secrets.S3_BUCKET }}
|
||||
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
|
||||
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
|
||||
- name: 5 Upload SP_LEGACY_IMG_GZ 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_IMG_GZ }}
|
||||
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
|
||||
|
||||
- name: 6 Upload SP_LEGACY_VMDK to SharePoint
|
||||
uses: xopenwrt/s3-upload-github-action@master
|
||||
env:
|
||||
FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_VMDK }}
|
||||
S3_ENDPOINT: 's3.openwrt.115115.xyz'
|
||||
S3_BUCKET: ${{ secrets.S3_BUCKET }}
|
||||
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
|
||||
S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
|
||||
- name: 6 Upload SP_LEGACY_VMDK 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_VMDK }}
|
||||
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
|
||||
|
||||
# - 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'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -376,7 +376,7 @@ jobs:
|
||||
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}
|
||||
|
||||
# - 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'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -390,7 +390,6 @@ jobs:
|
||||
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||
run: |
|
||||
rm openwrt/bin/Firmware/AutoBuild-*.v* -rf
|
||||
ls openwrt/bin/Firmware
|
||||
|
||||
- name: Upload Firmware to Github Release
|
||||
uses: svenstaro/upload-release-action@v2
|
||||
|
||||
@@ -164,9 +164,9 @@ jobs:
|
||||
./scripts/feeds update -a
|
||||
./scripts/feeds install -a
|
||||
./scripts/feeds uninstall luci-theme-argon
|
||||
# Update golang to 1.22 for xray-core build
|
||||
# Update golang to 1.24 for xray-core build
|
||||
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 24.x feeds/packages/lang/golang
|
||||
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
|
||||
#fix dockerd bug
|
||||
|
||||
@@ -256,7 +256,7 @@ jobs:
|
||||
- name: Download Github Release API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
SP_UEFI_IMG_GZ=openwrt/bin/Firmware/AutoBuild-*-UEFI-*.img.gz
|
||||
SP_UEFI_IMG_GZ=$(echo $SP_UEFI_IMG_GZ)
|
||||
SP_UEFI_IMG_GZ=${SP_UEFI_IMG_GZ##*/}
|
||||
@@ -291,7 +291,7 @@ jobs:
|
||||
echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV
|
||||
|
||||
- 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'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -302,7 +302,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
|
||||
|
||||
- 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'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -313,7 +313,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
|
||||
|
||||
# - 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'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -324,7 +324,7 @@ jobs:
|
||||
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
|
||||
|
||||
# - 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'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -335,7 +335,7 @@ jobs:
|
||||
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }}
|
||||
|
||||
- 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'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -346,7 +346,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
|
||||
|
||||
- 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'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -357,7 +357,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
|
||||
|
||||
# - 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'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -368,7 +368,7 @@ jobs:
|
||||
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}
|
||||
|
||||
# - 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'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
|
||||
@@ -164,9 +164,9 @@ jobs:
|
||||
./scripts/feeds update -a
|
||||
./scripts/feeds install -a
|
||||
./scripts/feeds uninstall luci-theme-argon
|
||||
# Update golang to 1.22 for xray-core build
|
||||
# Update golang to 1.24 for xray-core build
|
||||
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 24.x feeds/packages/lang/golang
|
||||
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
|
||||
#fix dockerd bug
|
||||
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
diff --git a/package/kernel/mac80211/intel.mk b/package/kernel/mac80211/intel.mk
|
||||
index 8d374d73e744..839127b6306d 100644
|
||||
--- a/package/kernel/mac80211/intel.mk
|
||||
+++ b/package/kernel/mac80211/intel.mk
|
||||
@@ -6,7 +6,7 @@ config-$(CONFIG_PACKAGE_IWLWIFI_DEBUGFS)+= IWLWIFI_DEBUGFS
|
||||
|
||||
define KernelPackage/iwlwifi
|
||||
$(call KernelPackage/mac80211/Default)
|
||||
- DEPENDS:= +kmod-mac80211 @PCI_SUPPORT +@DRIVER_11AC_SUPPORT +@DRIVER_11AX_SUPPORT
|
||||
+ DEPENDS:= @PCI_SUPPORT +@DRIVER_11AC_SUPPORT +@DRIVER_11AX_SUPPORT +kmod-mac80211 +LINUX_6_1:kmod-fs-efivarfs
|
||||
TITLE:=Intel AGN Wireless support
|
||||
FILES:= \
|
||||
$(PKG_BUILD_DIR)/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko \
|
||||
@@ -95,8 +95,8 @@ EOF
|
||||
# done ; unset x
|
||||
|
||||
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_luci-app-autoreboot-generic.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}
|
||||
# delete adguardhome in lede package
|
||||
# rm package/feeds/packages/net/adguardhome -rf
|
||||
|
||||
@@ -114,9 +114,9 @@ EOF
|
||||
;;
|
||||
x86_64)
|
||||
Copy ${CustomFiles}/Depends/cpuset ${BASE_FILES}/bin
|
||||
AddPackage git passwall-packages openwrt-passwall-packages Openwrt-Passwall main
|
||||
AddPackage git passwall-luci openwrt-passwall Openwrt-Passwall main
|
||||
AddPackage git passwall2-luci openwrt-passwall2 Openwrt-Passwall main
|
||||
AddPackage git passwall-depends openwrt-passwall-packages xiaorouji main
|
||||
AddPackage git passwall-luci openwrt-passwall xiaorouji main
|
||||
AddPackage git passwall2-luci openwrt-passwall2 xiaorouji main
|
||||
AddPackage git other luci-app-dockerman lisaac master
|
||||
rm -rf packages/lean/autocore # May Can Delete
|
||||
AddPackage git lean autocore-modify xopenwrt master
|
||||
|
||||
@@ -23,11 +23,8 @@ Firmware_Diy_Before() {
|
||||
fi
|
||||
case "${OP_AUTHOR}/${OP_REPO}" in
|
||||
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_Raw=$(cat package/lean/default-settings/files/zzz-default-settings | grep DISTRIB_REVISION)
|
||||
zzz_Default_Version="$(echo $Version_Raw | egrep -o "R[0-9]+\.[0-9]+\.[0-9]+")"
|
||||
zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})"
|
||||
OP_VERSION="${zzz_Default_Version}-${Compile_Date}"
|
||||
;;
|
||||
immortalwrt/immortalwrt)
|
||||
|
||||
@@ -18,7 +18,10 @@ echo "------------------------------- IP Address Info --------------------------
|
||||
IP=`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://api.vore.top/api/IPdata?ip=${IP} | jq -r .adcode.o
|
||||
Addr_Country=`curl -s "http://demo.ip-api.com/json/${IP}?fields=66842623&lang=zh-CN" | jq -r .country`
|
||||
Addr_Province=`curl -s "http://demo.ip-api.com/json/${IP}?fields=66842623&lang=zh-CN" | jq -r .regionName`
|
||||
Addr_City=`curl -s "http://demo.ip-api.com/json/${IP}?fields=66842623&lang=zh-CN" | jq -r .city`
|
||||
echo "${Addr_Country}, ${Addr_Province}, ${Addr_City}"
|
||||
}
|
||||
|
||||
Get_Release_Info() {
|
||||
|
||||
Reference in New Issue
Block a user