mirror of
https://github.com/xopenwrt/X-OpenWrt-New.git
synced 2026-09-27 07:14:43 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9246effd09 | ||
|
|
9bc8ff1288 | ||
|
|
c3b77b9bd3 | ||
|
|
2b9e22a351 | ||
|
|
13e85ab847 | ||
|
|
b6ca8b944c | ||
|
|
61444d2c11 | ||
|
|
ce4d832d49 | ||
|
|
c6944feabf | ||
|
|
57513cf4f8 | ||
|
|
da8ae4c8ef | ||
|
|
44c434d397 | ||
|
|
762d1ecd06 | ||
|
|
0e31ac6248 | ||
|
|
856ce8b5b5 | ||
|
|
dc6091db1a | ||
|
|
daf9fdc776 | ||
|
|
54f624a756 | ||
|
|
a665e75fa7 | ||
|
|
c62782c5d0 | ||
|
|
8770c61074 | ||
|
|
313bebb686 | ||
|
|
48675fbfc8 | ||
|
|
4e37e8d084 | ||
|
|
732b5f3844 | ||
|
|
d0be16a8cb | ||
|
|
e4a1159b3a | ||
|
|
d24793566c | ||
|
|
a34b742edd | ||
|
|
d5ab5a6b2c | ||
|
|
225c014e56 | ||
|
|
bff723d35c | ||
|
|
c80752ddf7 | ||
|
|
4e0ccaf038 | ||
|
|
5e08d7e060 | ||
|
|
caf11ba27e | ||
|
|
2e53d1b1f1 | ||
|
|
de3b57e64e | ||
|
|
c43892ad94 | ||
|
|
71e6f55a4e | ||
|
|
6c7873d959 | ||
|
|
f9b26dbad4 | ||
|
|
dfc88ebf8a |
@@ -216,7 +216,7 @@ jobs:
|
||||
- name: Download Github API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget 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 --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget 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 --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget 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 --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget 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 --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget 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 --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget 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 --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget 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 --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget 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,8 +30,8 @@ jobs:
|
||||
|
||||
- name: Download Github Release API
|
||||
run: |
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
|
||||
wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
|
||||
- name: Upload API to Github Release
|
||||
uses: svenstaro/upload-release-action@v2
|
||||
with:
|
||||
|
||||
@@ -136,6 +136,7 @@ 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
|
||||
@@ -220,7 +221,7 @@ jobs:
|
||||
- name: Download Github Release API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget 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##*/}
|
||||
@@ -255,7 +256,7 @@ jobs:
|
||||
echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV
|
||||
|
||||
- name: 1 Upload SP_UEFI_IMG_GZ to SharePoint
|
||||
uses: su-dont/share-point-uploader@v2.1
|
||||
uses: xopenwrt/share-point-uploader@v2.3
|
||||
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -266,7 +267,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
|
||||
|
||||
- name: 2 Upload SP_UEFI_VMDK to SharePoint
|
||||
uses: su-dont/share-point-uploader@v2.1
|
||||
uses: xopenwrt/share-point-uploader@v2.3
|
||||
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -277,7 +278,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
|
||||
|
||||
# - name: 3 Upload SP_UEFI_VDI to SharePoint
|
||||
# uses: su-dont/share-point-uploader@v2.1
|
||||
# uses: xopenwrt/share-point-uploader@v2.3
|
||||
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -288,7 +289,7 @@ jobs:
|
||||
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
|
||||
|
||||
# - name: 4 Upload SP_UEFI_VHDX to SharePoint
|
||||
# uses: su-dont/share-point-uploader@v2.1
|
||||
# uses: xopenwrt/share-point-uploader@v2.3
|
||||
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -299,7 +300,7 @@ jobs:
|
||||
# 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
|
||||
uses: xopenwrt/share-point-uploader@v2.3
|
||||
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -310,7 +311,7 @@ jobs:
|
||||
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
|
||||
uses: xopenwrt/share-point-uploader@v2.3
|
||||
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -321,7 +322,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
|
||||
|
||||
# - name: 7 Upload SP_LEGACY_VDI to SharePoint
|
||||
# uses: su-dont/share-point-uploader@v2.1
|
||||
# uses: xopenwrt/share-point-uploader@v2.3
|
||||
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -332,7 +333,7 @@ jobs:
|
||||
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}
|
||||
|
||||
# - name: 8 Upload SP_LEGACY_VHDX to SharePoint
|
||||
# uses: su-dont/share-point-uploader@v2.1
|
||||
# uses: xopenwrt/share-point-uploader@v2.3
|
||||
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
|
||||
@@ -26,9 +26,6 @@ on:
|
||||
Tempoary_FLAG:
|
||||
description: '固件名称后缀 [可选]'
|
||||
default: 'X'
|
||||
Tempoary_Remove_AMDGPU:
|
||||
description: '是否移除AMD GPU驱动'
|
||||
default: 'true'
|
||||
### 结束
|
||||
|
||||
#push:
|
||||
@@ -71,7 +68,6 @@ 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 ]
|
||||
@@ -84,11 +80,11 @@ jobs:
|
||||
- name: Maximize Build Space
|
||||
uses: easimon/maximize-build-space@master
|
||||
with:
|
||||
root-reserve-mb: 3500
|
||||
swap-size-mb: 100
|
||||
root-reserve-mb: 4096
|
||||
swap-size-mb: 512
|
||||
temp-reserve-mb: 1024
|
||||
remove-dotnet: 'true'
|
||||
remove-android: 'true'
|
||||
remove-haskell: 'true'
|
||||
|
||||
- name: Checkout
|
||||
uses: actions/checkout@main
|
||||
@@ -155,7 +151,7 @@ jobs:
|
||||
DEBIAN_FRONTEND: noninteractive
|
||||
run: |
|
||||
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 timedatectl set-timezone "Asia/Shanghai"
|
||||
sudo mkdir -p /workdir
|
||||
@@ -182,9 +178,9 @@ jobs:
|
||||
./scripts/feeds update -a
|
||||
./scripts/feeds install -a
|
||||
./scripts/feeds uninstall luci-theme-argon
|
||||
# Update golang to 1.24 for xray-core build
|
||||
# Update golang to 1.22 for xray-core build
|
||||
rm -rf feeds/packages/lang/golang
|
||||
git clone https://github.com/sbwml/packages_lang_golang -b 24.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
|
||||
#fix dockerd bug
|
||||
|
||||
@@ -202,10 +198,6 @@ 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
|
||||
@@ -220,12 +212,18 @@ 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
|
||||
rm feeds/luci/applications/luci-app-adguardhome -rf
|
||||
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
|
||||
# 2024.03.03 mosdns build fail by golang 1.22
|
||||
sed -i 's/CGO_ENABLED=0/CGO_ENABLED=1/g' feeds/packages/net/mosdns/Makefile
|
||||
make -j4 | tee ./build_log.log || make -j1 V=s
|
||||
make -j4 2>&1 | tee build_log.log
|
||||
if [ "${PIPESTATUS[0]}" -ne 0 ]; then
|
||||
make -j1 V=s
|
||||
fi
|
||||
[ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
|
||||
|
||||
|
||||
@@ -263,6 +261,9 @@ 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
|
||||
@@ -281,7 +282,7 @@ jobs:
|
||||
- name: Download Github Release API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget 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##*/}
|
||||
@@ -315,93 +316,41 @@ 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_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: 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: 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: 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: 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: 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: 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: 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: Delete VM Disk File
|
||||
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||
|
||||
@@ -26,9 +26,6 @@ on:
|
||||
Tempoary_FLAG:
|
||||
description: '固件名称后缀 [可选]'
|
||||
default: 'X'
|
||||
Tempoary_Remove_AMDGPU:
|
||||
description: '是否移除AMD GPU驱动'
|
||||
default: 'true'
|
||||
### 结束
|
||||
|
||||
#push:
|
||||
@@ -77,7 +74,6 @@ 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
|
||||
|
||||
@@ -172,9 +168,9 @@ jobs:
|
||||
./scripts/feeds update -a
|
||||
./scripts/feeds install -a
|
||||
./scripts/feeds uninstall luci-theme-argon
|
||||
# Update golang to 1.24 for xray-core build
|
||||
# Update golang to 1.22 for xray-core build
|
||||
rm -rf feeds/packages/lang/golang
|
||||
git clone https://github.com/sbwml/packages_lang_golang -b 24.x feeds/packages/lang/golang
|
||||
git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
|
||||
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
|
||||
#fix dockerd bug
|
||||
|
||||
@@ -192,10 +188,6 @@ 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
|
||||
@@ -272,7 +264,7 @@ jobs:
|
||||
- name: Download Github Release API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget 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##*/}
|
||||
@@ -307,7 +299,7 @@ jobs:
|
||||
echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV
|
||||
|
||||
- name: 1 Upload SP_UEFI_IMG_GZ to SharePoint
|
||||
uses: su-dont/share-point-uploader@v2.1
|
||||
uses: xopenwrt/share-point-uploader@v2.3
|
||||
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -318,7 +310,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
|
||||
|
||||
- name: 2 Upload SP_UEFI_VMDK to SharePoint
|
||||
uses: su-dont/share-point-uploader@v2.1
|
||||
uses: xopenwrt/share-point-uploader@v2.3
|
||||
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -329,7 +321,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
|
||||
|
||||
# - name: 3 Upload SP_UEFI_VDI to SharePoint
|
||||
# uses: su-dont/share-point-uploader@v2.1
|
||||
# uses: xopenwrt/share-point-uploader@v2.3
|
||||
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -340,7 +332,7 @@ jobs:
|
||||
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
|
||||
|
||||
# - name: 4 Upload SP_UEFI_VHDX to SharePoint
|
||||
# uses: su-dont/share-point-uploader@v2.1
|
||||
# uses: xopenwrt/share-point-uploader@v2.3
|
||||
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -351,7 +343,7 @@ jobs:
|
||||
# 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
|
||||
uses: xopenwrt/share-point-uploader@v2.3
|
||||
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -362,7 +354,7 @@ jobs:
|
||||
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
|
||||
uses: xopenwrt/share-point-uploader@v2.3
|
||||
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -373,7 +365,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
|
||||
|
||||
# - name: 7 Upload SP_LEGACY_VDI to SharePoint
|
||||
# uses: su-dont/share-point-uploader@v2.1
|
||||
# uses: xopenwrt/share-point-uploader@v2.3
|
||||
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -384,7 +376,7 @@ jobs:
|
||||
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}
|
||||
|
||||
# - name: 8 Upload SP_LEGACY_VHDX to SharePoint
|
||||
# uses: su-dont/share-point-uploader@v2.1
|
||||
# uses: xopenwrt/share-point-uploader@v2.3
|
||||
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
|
||||
@@ -65,11 +65,11 @@ jobs:
|
||||
- name: Maximize Build Space
|
||||
uses: easimon/maximize-build-space@master
|
||||
with:
|
||||
root-reserve-mb: 5120
|
||||
root-reserve-mb: 4096
|
||||
swap-size-mb: 512
|
||||
temp-reserve-mb: 1024
|
||||
remove-dotnet: 'true'
|
||||
remove-android: 'true'
|
||||
remove-haskell: 'true'
|
||||
|
||||
- name: Checkout
|
||||
uses: actions/checkout@main
|
||||
@@ -142,7 +142,7 @@ jobs:
|
||||
DEBIAN_FRONTEND: noninteractive
|
||||
run: |
|
||||
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 timedatectl set-timezone "Asia/Shanghai"
|
||||
sudo mkdir -p /workdir
|
||||
@@ -175,9 +175,9 @@ jobs:
|
||||
./scripts/feeds update -a
|
||||
./scripts/feeds install -a
|
||||
./scripts/feeds uninstall luci-theme-argon
|
||||
# Update golang to 1.24 for xray-core build
|
||||
# Update golang to 1.22 for xray-core build
|
||||
rm -rf feeds/packages/lang/golang
|
||||
git clone https://github.com/sbwml/packages_lang_golang -b 24.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
|
||||
#fix dockerd bug
|
||||
|
||||
@@ -209,8 +209,11 @@ 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
|
||||
rm feeds/luci/applications/luci-app-adguardhome -rf
|
||||
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
|
||||
# 2024.03.03 mosdns build fail by golang 1.22
|
||||
sed -i 's/CGO_ENABLED=0/CGO_ENABLED=1/g' feeds/packages/net/mosdns/Makefile
|
||||
@@ -250,6 +253,9 @@ 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
|
||||
@@ -268,7 +274,7 @@ jobs:
|
||||
- name: Download Github Release API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget 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##*/}
|
||||
@@ -302,93 +308,41 @@ 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_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: 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: 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: 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: 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: 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: 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: 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: Delete VM Disk File
|
||||
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||
|
||||
@@ -65,8 +65,9 @@ jobs:
|
||||
- name: Maximize Build Space
|
||||
uses: easimon/maximize-build-space@master
|
||||
with:
|
||||
root-reserve-mb: 5120
|
||||
root-reserve-mb: 4096
|
||||
swap-size-mb: 512
|
||||
temp-reserve-mb: 1024
|
||||
remove-dotnet: 'true'
|
||||
remove-android: 'true'
|
||||
|
||||
@@ -139,13 +140,14 @@ jobs:
|
||||
DEBIAN_FRONTEND: noninteractive
|
||||
run: |
|
||||
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 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
|
||||
@@ -172,9 +174,9 @@ jobs:
|
||||
./scripts/feeds update -a
|
||||
./scripts/feeds install -a
|
||||
./scripts/feeds uninstall luci-theme-argon
|
||||
# Update golang to 1.24 for xray-core build
|
||||
# Update golang to 1.22 for xray-core build
|
||||
rm -rf feeds/packages/lang/golang
|
||||
git clone https://github.com/sbwml/packages_lang_golang -b 24.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
|
||||
#fix dockerd bug
|
||||
|
||||
@@ -206,10 +208,13 @@ 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
|
||||
rm feeds/luci/applications/luci-app-adguardhome -rf
|
||||
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
|
||||
make -j4 | tee ./build_log.log || make -j1 V=s
|
||||
set -o pipefail && make -j4 2>&1 | tee build_log.log || make -j1 V=s
|
||||
# 2024.03.03 mosdns build fail by golang 1.22
|
||||
sed -i 's/CGO_ENABLED=0/CGO_ENABLED=1/g' feeds/packages/net/mosdns/Makefile
|
||||
[ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
|
||||
@@ -246,6 +251,10 @@ 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
|
||||
@@ -264,7 +273,7 @@ jobs:
|
||||
- name: Download Github Release API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget 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##*/}
|
||||
@@ -298,30 +307,26 @@ 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_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: 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: 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: 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: 3 Upload SP_UEFI_VDI to SharePoint
|
||||
# uses: su-dont/share-point-uploader@v2.1
|
||||
# uses: xopenwrt/share-point-uploader@v2.3
|
||||
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -332,7 +337,7 @@ jobs:
|
||||
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
|
||||
|
||||
# - name: 4 Upload SP_UEFI_VHDX to SharePoint
|
||||
# uses: su-dont/share-point-uploader@v2.1
|
||||
# uses: xopenwrt/share-point-uploader@v2.3
|
||||
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -342,30 +347,26 @@ 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: 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: 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: 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: 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: 7 Upload SP_LEGACY_VDI to SharePoint
|
||||
# uses: su-dont/share-point-uploader@v2.1
|
||||
# uses: xopenwrt/share-point-uploader@v2.3
|
||||
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -376,7 +377,7 @@ jobs:
|
||||
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}
|
||||
|
||||
# - name: 8 Upload SP_LEGACY_VHDX to SharePoint
|
||||
# uses: su-dont/share-point-uploader@v2.1
|
||||
# uses: xopenwrt/share-point-uploader@v2.3
|
||||
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -390,6 +391,7 @@ 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.24 for xray-core build
|
||||
# Update golang to 1.22 for xray-core build
|
||||
rm -rf feeds/packages/lang/golang
|
||||
git clone https://github.com/sbwml/packages_lang_golang -b 24.x feeds/packages/lang/golang
|
||||
git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
|
||||
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
|
||||
#fix dockerd bug
|
||||
|
||||
@@ -256,7 +256,7 @@ jobs:
|
||||
- name: Download Github Release API
|
||||
if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
|
||||
run: |
|
||||
wget --tries=5 --wait=5 https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
|
||||
wget 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: su-dont/share-point-uploader@v2.1
|
||||
uses: xopenwrt/share-point-uploader@v2.3
|
||||
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -302,7 +302,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
|
||||
|
||||
- name: 2 Upload SP_UEFI_VMDK to SharePoint
|
||||
uses: su-dont/share-point-uploader@v2.1
|
||||
uses: xopenwrt/share-point-uploader@v2.3
|
||||
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -313,7 +313,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
|
||||
|
||||
# - name: 3 Upload SP_UEFI_VDI to SharePoint
|
||||
# uses: su-dont/share-point-uploader@v2.1
|
||||
# uses: xopenwrt/share-point-uploader@v2.3
|
||||
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -324,7 +324,7 @@ jobs:
|
||||
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
|
||||
|
||||
# - name: 4 Upload SP_UEFI_VHDX to SharePoint
|
||||
# uses: su-dont/share-point-uploader@v2.1
|
||||
# uses: xopenwrt/share-point-uploader@v2.3
|
||||
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -335,7 +335,7 @@ jobs:
|
||||
# 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
|
||||
uses: xopenwrt/share-point-uploader@v2.3
|
||||
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -346,7 +346,7 @@ jobs:
|
||||
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
|
||||
uses: xopenwrt/share-point-uploader@v2.3
|
||||
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
with:
|
||||
sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -357,7 +357,7 @@ jobs:
|
||||
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
|
||||
|
||||
# - name: 7 Upload SP_LEGACY_VDI to SharePoint
|
||||
# uses: su-dont/share-point-uploader@v2.1
|
||||
# uses: xopenwrt/share-point-uploader@v2.3
|
||||
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
@@ -368,7 +368,7 @@ jobs:
|
||||
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}
|
||||
|
||||
# - name: 8 Upload SP_LEGACY_VHDX to SharePoint
|
||||
# uses: su-dont/share-point-uploader@v2.1
|
||||
# uses: xopenwrt/share-point-uploader@v2.3
|
||||
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
|
||||
# with:
|
||||
# sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
|
||||
|
||||
@@ -164,9 +164,9 @@ jobs:
|
||||
./scripts/feeds update -a
|
||||
./scripts/feeds install -a
|
||||
./scripts/feeds uninstall luci-theme-argon
|
||||
# Update golang to 1.24 for xray-core build
|
||||
# Update golang to 1.22 for xray-core build
|
||||
rm -rf feeds/packages/lang/golang
|
||||
git clone https://github.com/sbwml/packages_lang_golang -b 24.x feeds/packages/lang/golang
|
||||
git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
|
||||
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
|
||||
#fix dockerd bug
|
||||
|
||||
|
||||
@@ -87,6 +87,10 @@ CONFIG_TARGET_ROOTFS_PARTSIZE=800
|
||||
CONFIG_TARGET_IMAGES_GZIP=y
|
||||
CONFIG_PACKAGE_ntfs3-mount=y
|
||||
|
||||
|
||||
CONFIG_PACKAGE_xz=y
|
||||
CONFIG_PACKAGE_xz-utils=y
|
||||
|
||||
# CONFIG_SIGNATURE_CHECK is not set
|
||||
# CONFIG_SIGNED_PACKAGES is not set
|
||||
# CONFIG_PACKAGE_luci-app-unblockmusic is not set
|
||||
|
||||
@@ -60,6 +60,9 @@ CONFIG_TARGET_IMAGES_GZIP=y
|
||||
CONFIG_PACKAGE_ntfs3-mount=y
|
||||
|
||||
|
||||
CONFIG_PACKAGE_xz=y
|
||||
CONFIG_PACKAGE_xz-utils=y
|
||||
|
||||
# CONFIG_SIGNATURE_CHECK is not set
|
||||
# CONFIG_SIGNED_PACKAGES is not set
|
||||
# CONFIG_PACKAGE_luci-app-unblockmusic is not set
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
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-depends openwrt-passwall-packages xiaorouji main
|
||||
AddPackage git passwall-luci openwrt-passwall xiaorouji main
|
||||
AddPackage git passwall2-luci openwrt-passwall2 xiaorouji main
|
||||
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 other luci-app-dockerman lisaac master
|
||||
rm -rf packages/lean/autocore # May Can Delete
|
||||
AddPackage git lean autocore-modify xopenwrt master
|
||||
|
||||
@@ -23,8 +23,11 @@ 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
|
||||
zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})"
|
||||
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]+")"
|
||||
OP_VERSION="${zzz_Default_Version}-${Compile_Date}"
|
||||
;;
|
||||
immortalwrt/immortalwrt)
|
||||
|
||||
@@ -18,10 +18,7 @@ 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
|
||||
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}"
|
||||
# curl -s "https://api.vore.top/api/IPdata?ip=${IP}" | jq -r .adcode.o
|
||||
}
|
||||
|
||||
Get_Release_Info() {
|
||||
|
||||
Reference in New Issue
Block a user