xinb
/
X-OpenWrt
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: xinb:v2024-01-19
Branches Tags
xinb:master
xinb:dev
xinb:v2026-01-13
xinb:v2025-12-04
xinb:v2025-11-26
xinb:v2025-11-25
xinb:v2025-11-24
xinb:v2025-11-22
xinb:v2025-07-20
xinb:v2025-07-21
xinb:v2024-12-12
xinb:v2024-12-08
xinb:v2024-12-09
xinb:v2024-12-07
xinb:v2024-12-05
xinb:v2024-12-06
xinb:v2024-09-22
xinb:v2024-06-16
xinb:v2024-06-12
xinb:v2024-06-04
xinb:v2024-05-21
xinb:v2024-04-17
xinb:v2024-03-04
xinb:v2024-03-03
xinb:v2024-03-02
xinb:v2024-01-19
xinb:AutoUpdate_old
xinb:AutoUpdate
...
compare: xinb:master
Branches Tags
xinb:master
xinb:dev
xinb:v2026-01-13
xinb:v2025-12-04
xinb:v2025-11-26
xinb:v2025-11-25
xinb:v2025-11-24
xinb:v2025-11-22
xinb:v2025-07-20
xinb:v2025-07-21
xinb:v2024-12-12
xinb:v2024-12-08
xinb:v2024-12-09
xinb:v2024-12-07
xinb:v2024-12-05
xinb:v2024-12-06
xinb:v2024-09-22
xinb:v2024-06-16
xinb:v2024-06-12
xinb:v2024-06-04
xinb:v2024-05-21
xinb:v2024-04-17
xinb:v2024-03-04
xinb:v2024-03-03
xinb:v2024-03-02
xinb:v2024-01-19
xinb:AutoUpdate_old
xinb:AutoUpdate

46 Commits
v2024-01-1 ... master

Author SHA1 Message Date
xopenwrt 48675fbfc8
Release New Version 2025-11-27 10:30:50 +08:00
xopenwrt 4e37e8d084
fix action upload 2025-11-26 19:34:44 +08:00
xopenwrt 732b5f3844
Test 2025-11-26 19:17:39 +08:00
xopenwrt d0be16a8cb
Test upload 2025-11-26 19:15:12 +08:00
xopenwrt e4a1159b3a
fix upload path 2025-11-26 02:09:51 +08:00
xopenwrt d24793566c
fix s3 upload 2025-11-25 23:48:50 +08:00
xopenwrt a34b742edd
fix S3 upload bug 2025-11-25 23:45:29 +08:00
xopenwrt d5ab5a6b2c
update 2025-11-25 23:43:05 +08:00
xopenwrt 225c014e56
update 2025-11-25 23:41:10 +08:00
xopenwrt bff723d35c
test 2025-11-25 23:32:32 +08:00
xopenwrt c80752ddf7
Add API Test 2025-11-25 23:20:35 +08:00
xopenwrt 4e0ccaf038
test S3 upload 2025-11-25 19:49:01 +08:00
xopenwrt 5e08d7e060
update uploader 2025-11-25 12:55:09 +08:00
xopenwrt caf11ba27e
fix sharepoint uploader 2025-11-25 09:55:51 +08:00
xopenwrt 2e53d1b1f1
update golang version 2025-11-25 00:14:07 +08:00
xopenwrt de3b57e64e
fix 2025-11-22 21:58:53 +08:00
xopenwrt c43892ad94
test 2025-11-22 19:38:19 +08:00
xopenwrt 71e6f55a4e
remove mac80211 patch 2025-11-22 15:16:25 +08:00
xopenwrt 6c7873d959
fix Release get 2025-11-22 15:08:39 +08:00
xopenwrt f9b26dbad4
rm docker image rm 2025-11-22 14:49:26 +08:00
xopenwrt dfc88ebf8a
fix ip API 2025-11-22 14:29:58 +08:00
xopenwrt 696b8de1e8
Remove err theme 2024-12-09 01:54:22 +08:00
xopenwrt b6a5ac592d
revert passwall2 to passwall 2024-12-09 01:45:04 +08:00
xopenwrt b317947b55
close CCACHE to fix vlmcsd build err 2024-12-08 23:05:49 +08:00
xopenwrt 68ae53cdc7
Test 2024-12-08 22:34:18 +08:00
xopenwrt 7612a90e97
Test 2024-12-08 22:14:00 +08:00
xopenwrt 3e51857c93
Test 2024-12-08 22:11:45 +08:00
xopenwrt 99725eccb2
set kernel 6.1 2024-12-07 23:32:22 +08:00
xopenwrt f367a47f5a
Test 2024-12-06 03:23:59 +08:00
xopenwrt a4cc1e452f
delete image upload 2024-12-06 02:58:38 +08:00
xopenwrt 69ef21e6d8
Test 2024-12-06 02:00:43 +08:00
xopenwrt 99b5a7e516
Test 2024-12-06 01:27:39 +08:00
xopenwrt bc162a6972
fix build err 2024-12-06 00:04:36 +08:00
xopenwrt cd35575b41
fix build err 2024-12-05 23:56:32 +08:00
xopenwrt dea2ff1779
fix old version package 2024-09-22 15:54:00 +08:00
xopenwrt 15e05f2b9e
fix Mine 2024-09-22 15:38:15 +08:00
xopenwrt afadb32ab3
Remove Python2.7 2024-09-22 13:47:52 +08:00
xopenwrt 93378f605f
Change Kernel Version 2024-09-22 13:47:02 +08:00
xopenwrt 0df854059e
Test 2024-09-21 22:46:55 +08:00
xopenwrt b850cfbf38
Update X-x86_64_Z_Mine.yml 2024-09-21 15:54:12 +08:00
xopenwrt 032c1871e2
Change Sites 2024-06-05 01:27:04 +08:00
xopenwrt c6f3c5c47b
fix X version kmod 2024-03-04 20:21:10 +08:00
xopenwrt ac970eefa5
fix mosdns build error 2024-03-03 20:18:16 +08:00
xopenwrt ed93a4f947
Add Auto Package Version Check 2024-03-03 19:26:39 +08:00
xopenwrt 62048e1110
Use kernel 6.1 2024-03-02 23:39:40 +08:00
xopenwrt c95827b455
Version Auto Check 2024-03-02 20:19:38 +08:00
25 changed files with 842 additions and 363 deletions
Show Stats Expand all files Collapse all files

6
.github/workflows/AutoBuild-asus_rt-acrh17.yml vendored
View File

@ -54,7 +54,7 @@ env:
jobs: jobs:
Compile: Compile:
runs-on: ubuntu-20.04 runs-on: ubuntu-latest
permissions: permissions:
issues: write issues: write
pull-requests: write pull-requests: write
@ -121,7 +121,7 @@ jobs:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
run: | run: |
sudo -E apt-get update sudo -E apt-get update
sudo -E apt-get -y install busybox build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs rsync sudo -E apt-get -y install busybox 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 timedatectl set-timezone "Asia/Shanghai" sudo timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir sudo mkdir -p /workdir
sudo chown $USER:$GROUPS /workdir sudo chown $USER:$GROUPS /workdir
@ -157,7 +157,7 @@ jobs:
cd openwrt cd openwrt
if [ "${{ env.CACHE_ACCELERATE }}" == true ] if [ "${{ env.CACHE_ACCELERATE }}" == true ]
then then
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
fi fi
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh

6
.github/workflows/AutoBuild-d-team_newifi-d2.yml vendored
View File

@ -54,7 +54,7 @@ env:
jobs: jobs:
Compile: Compile:
runs-on: ubuntu-20.04 runs-on: ubuntu-latest
permissions: permissions:
issues: write issues: write
pull-requests: write pull-requests: write
@ -121,7 +121,7 @@ jobs:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
run: | run: |
sudo -E apt-get update sudo -E apt-get update
sudo -E apt-get -y install busybox build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs rsync sudo -E apt-get -y install busybox 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 timedatectl set-timezone "Asia/Shanghai" sudo timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir sudo mkdir -p /workdir
sudo chown $USER:$GROUPS /workdir sudo chown $USER:$GROUPS /workdir
@ -157,7 +157,7 @@ jobs:
cd openwrt cd openwrt
if [ "${{ env.CACHE_ACCELERATE }}" == true ] if [ "${{ env.CACHE_ACCELERATE }}" == true ]
then then
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
fi fi
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh

6
.github/workflows/AutoBuild-p2w_r619ac-128m.yml vendored
View File

@ -54,7 +54,7 @@ env:
jobs: jobs:
Compile: Compile:
runs-on: ubuntu-20.04 runs-on: ubuntu-latest
permissions: permissions:
issues: write issues: write
pull-requests: write pull-requests: write
@ -121,7 +121,7 @@ jobs:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
run: | run: |
sudo -E apt-get update sudo -E apt-get update
sudo -E apt-get -y install busybox build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs rsync sudo -E apt-get -y install busybox 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 timedatectl set-timezone "Asia/Shanghai" sudo timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir sudo mkdir -p /workdir
sudo chown $USER:$GROUPS /workdir sudo chown $USER:$GROUPS /workdir
@ -157,7 +157,7 @@ jobs:
cd openwrt cd openwrt
if [ "${{ env.CACHE_ACCELERATE }}" == true ] if [ "${{ env.CACHE_ACCELERATE }}" == true ]
then then
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
fi fi
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh

6
.github/workflows/AutoBuild-x86_64.yml vendored
View File

@ -54,7 +54,7 @@ env:
jobs: jobs:
Compile: Compile:
runs-on: ubuntu-20.04 runs-on: ubuntu-latest
permissions: permissions:
issues: write issues: write
pull-requests: write pull-requests: write
@ -120,7 +120,7 @@ jobs:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
run: | run: |
sudo -E apt-get update sudo -E apt-get update
sudo -E apt-get -y install busybox build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs rsync sudo -E apt-get -y install busybox 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 timedatectl set-timezone "Asia/Shanghai" sudo timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir sudo mkdir -p /workdir
sudo chown $USER:$GROUPS /workdir sudo chown $USER:$GROUPS /workdir
@ -156,7 +156,7 @@ jobs:
cd openwrt cd openwrt
if [ "${{ env.CACHE_ACCELERATE }}" == true ] if [ "${{ env.CACHE_ACCELERATE }}" == true ]
then then
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
fi fi
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh

6
.github/workflows/AutoBuild-xiaomi_mi-router-4a-gigabit.yml vendored
View File

@ -54,7 +54,7 @@ env:
jobs: jobs:
Compile: Compile:
runs-on: ubuntu-20.04 runs-on: ubuntu-latest
permissions: permissions:
issues: write issues: write
pull-requests: write pull-requests: write
@ -121,7 +121,7 @@ jobs:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
run: | run: |
sudo -E apt-get update sudo -E apt-get update
sudo -E apt-get -y install busybox build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs rsync sudo -E apt-get -y install busybox 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 timedatectl set-timezone "Asia/Shanghai" sudo timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir sudo mkdir -p /workdir
sudo chown $USER:$GROUPS /workdir sudo chown $USER:$GROUPS /workdir
@ -157,7 +157,7 @@ jobs:
cd openwrt cd openwrt
if [ "${{ env.CACHE_ACCELERATE }}" == true ] if [ "${{ env.CACHE_ACCELERATE }}" == true ]
then then
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
fi fi
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh

6
.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml vendored
View File

@ -54,7 +54,7 @@ env:
jobs: jobs:
Compile: Compile:
runs-on: ubuntu-20.04 runs-on: ubuntu-latest
permissions: permissions:
issues: write issues: write
pull-requests: write pull-requests: write
@ -121,7 +121,7 @@ jobs:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
run: | run: |
sudo -E apt-get update sudo -E apt-get update
sudo -E apt-get -y install busybox build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs rsync sudo -E apt-get -y install busybox 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 timedatectl set-timezone "Asia/Shanghai" sudo timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir sudo mkdir -p /workdir
sudo chown $USER:$GROUPS /workdir sudo chown $USER:$GROUPS /workdir
@ -157,7 +157,7 @@ jobs:
cd openwrt cd openwrt
if [ "${{ env.CACHE_ACCELERATE }}" == true ] if [ "${{ env.CACHE_ACCELERATE }}" == true ]
then then
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
fi fi
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh

6
.github/workflows/AutoBuild-xiaomi_redmi-router-ax6s.yml vendored
View File

@ -54,7 +54,7 @@ env:
jobs: jobs:
Compile: Compile:
runs-on: ubuntu-20.04 runs-on: ubuntu-latest
permissions: permissions:
issues: write issues: write
pull-requests: write pull-requests: write
@ -121,7 +121,7 @@ jobs:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
run: | run: |
sudo -E apt-get update sudo -E apt-get update
sudo -E apt-get -y install busybox build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs rsync sudo -E apt-get -y install busybox 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 timedatectl set-timezone "Asia/Shanghai" sudo timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir sudo mkdir -p /workdir
sudo chown $USER:$GROUPS /workdir sudo chown $USER:$GROUPS /workdir
@ -157,7 +157,7 @@ jobs:
cd openwrt cd openwrt
if [ "${{ env.CACHE_ACCELERATE }}" == true ] if [ "${{ env.CACHE_ACCELERATE }}" == true ]
then then
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
fi fi
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh

6
.github/workflows/AutoBuild-xiaoyu_xy-c5.yml vendored
View File

@ -54,7 +54,7 @@ env:
jobs: jobs:
Compile: Compile:
runs-on: ubuntu-20.04 runs-on: ubuntu-latest
permissions: permissions:
issues: write issues: write
pull-requests: write pull-requests: write
@ -121,7 +121,7 @@ jobs:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
run: | run: |
sudo -E apt-get update sudo -E apt-get update
sudo -E apt-get -y install busybox build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs rsync sudo -E apt-get -y install busybox 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 timedatectl set-timezone "Asia/Shanghai" sudo timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir sudo mkdir -p /workdir
sudo chown $USER:$GROUPS /workdir sudo chown $USER:$GROUPS /workdir
@ -157,7 +157,7 @@ jobs:
cd openwrt cd openwrt
if [ "${{ env.CACHE_ACCELERATE }}" == true ] if [ "${{ env.CACHE_ACCELERATE }}" == true ]
then then
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
fi fi
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh

2
.github/workflows/Module-Refresh_API.yml vendored
View File

@ -31,7 +31,7 @@ jobs:
- name: Download Github Release API - name: Download Github Release API
run: | run: |
wget 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 - name: Upload API to Github Release
uses: svenstaro/upload-release-action@v2 uses: svenstaro/upload-release-action@v2
with: with:

40
.github/workflows/X-x86_64_Test.yml vendored
View File

@ -60,7 +60,7 @@ env:
jobs: jobs:
Compile: Compile:
runs-on: ubuntu-20.04 runs-on: ubuntu-latest
steps: steps:
- name: Test - name: Test
run: | run: |
@ -130,13 +130,13 @@ jobs:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
run: | run: |
sudo -E apt-get update sudo -E apt-get update
sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs 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 timedatectl set-timezone "Asia/Shanghai" sudo timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir sudo mkdir -p /workdir
sudo chown $USER:$GROUPS /workdir sudo chown $USER:$GROUPS /workdir
if [ "${{ env.DELETE_USELESS_FILES }}" == true ] if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
then then
docker rmi node:18 node:18-alpine node:14-alpine node:16-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest node:16 node:14 ubuntu:20.04 buildpack-deps:stretch buildpack-deps:buster buildpack-deps:bullseye debian:9 debian:10 debian:11 ubuntu:18.04 ubuntu:16.04 docker rmi node:18 node:20 node:22 node:18-alpine node:20-alpine node:22-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest ubuntu:20.04 debian:10 debian:11
sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
sudo -E apt-get -y autoremove --purge sudo -E apt-get -y autoremove --purge
sudo -E apt-get clean sudo -E apt-get clean
@ -172,7 +172,7 @@ jobs:
cd openwrt cd openwrt
if [ "${{ env.CACHE_ACCELERATE }}" == true ] if [ "${{ env.CACHE_ACCELERATE }}" == true ]
then then
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
fi fi
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
@ -256,10 +256,10 @@ jobs:
echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV
- name: 1 Upload SP_UEFI_IMG_GZ to SharePoint - name: 1 Upload SP_UEFI_IMG_GZ to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.3
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }} sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }} sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -267,10 +267,10 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }} file: openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
- name: 2 Upload SP_UEFI_VMDK to SharePoint - name: 2 Upload SP_UEFI_VMDK to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.3
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }} sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }} sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -278,10 +278,10 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }} file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
# - name: 3 Upload SP_UEFI_VDI to SharePoint # - name: 3 Upload SP_UEFI_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.3
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }} # sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }} # sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -289,10 +289,10 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
# - name: 4 Upload SP_UEFI_VHDX to SharePoint # - name: 4 Upload SP_UEFI_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.3
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }} # sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }} # sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -300,10 +300,10 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }} # file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }}
- name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint - name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.3
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }} sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }} sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -311,10 +311,10 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }} file: openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
- name: 6 Upload SP_LEGACY_VMDK to SharePoint - name: 6 Upload SP_LEGACY_VMDK to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.3
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }} sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }} sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -322,10 +322,10 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }} file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
# - name: 7 Upload SP_LEGACY_VDI to SharePoint # - name: 7 Upload SP_LEGACY_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.3
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }} # sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }} # sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -333,10 +333,10 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}
# - name: 8 Upload SP_LEGACY_VHDX to SharePoint # - name: 8 Upload SP_LEGACY_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.3
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }} # sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }} # sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}

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

@ -60,7 +60,7 @@ env:
jobs: jobs:
Compile: Compile:
runs-on: ubuntu-20.04 runs-on: ubuntu-latest
steps: steps:
- name: Get current date & Set env - name: Get current date & Set env
id: date id: date
@ -72,7 +72,6 @@ jobs:
echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV
if [ "${{ env.DELETE_USELESS_FILES }}" == true ] if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
then then
docker rmi node:18 node:18-alpine node:16-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest node:16 ubuntu:20.04 debian:9 debian:10 debian:11
sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
sudo -E apt-get -y autoremove --purge sudo -E apt-get -y autoremove --purge
sudo -E apt-get clean sudo -E apt-get clean
@ -152,7 +151,8 @@ jobs:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
run: | run: |
sudo -E apt-get update sudo -E apt-get update
sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs 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 timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir sudo mkdir -p /workdir
sudo chown $USER:$GROUPS /workdir sudo chown $USER:$GROUPS /workdir
@ -180,7 +180,7 @@ jobs:
./scripts/feeds uninstall luci-theme-argon ./scripts/feeds uninstall luci-theme-argon
# Update golang to 1.22 for xray-core build # Update golang to 1.22 for xray-core build
rm -rf feeds/packages/lang/golang rm -rf feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile # sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug #fix dockerd bug
@ -190,7 +190,7 @@ jobs:
cd openwrt cd openwrt
if [ "${{ env.CACHE_ACCELERATE }}" == true ] if [ "${{ env.CACHE_ACCELERATE }}" == true ]
then then
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
fi fi
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
@ -215,15 +215,49 @@ jobs:
rm package/feeds/packages/adguardhome -rf rm package/feeds/packages/adguardhome -rf
rm feeds/packages/net/adguardhome -rf rm feeds/packages/net/adguardhome -rf
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
make -j4 || 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
make -j4 | tee ./build_log.log || make -j1 V=s
[ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
- name: Check Build Update
run: |
export NOW_DATA_VERSION=${{env.NOW_DATA_VERSION}}
export GITHUB_WORKSPACE=$GITHUB_WORKSPACE
bash $GITHUB_WORKSPACE/Scripts/AutoBuild_Upcheck.sh ${{env.Tempoary_FLAG}}
- name: Upload Package Version to Github Release
uses: svenstaro/upload-release-action@v2
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{env.Tempoary_FLAG}}_build_pkg_ver.log
file_glob: true
tag: v${{ steps.date.outputs.date }}
overwrite: true
- name: Upload Package Update to Github Release
uses: svenstaro/upload-release-action@v2
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{env.Tempoary_FLAG}}_build_pkg_up.log
file_glob: true
tag: v${{ steps.date.outputs.date }}
overwrite: true
- name: Process Firmware - name: Process Firmware
if: env.Result == 'true' && !cancelled() if: env.Result == 'true' && !cancelled()
run: | run: |
cd openwrt cd openwrt
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
Firmware_Diy_End Firmware_Diy_End
cd ..
mkdir ${{ steps.date.outputs.date }}
cp openwrt/bin/Firmware/* ./${{ steps.date.outputs.date }} -r
- name: Upload Firmware to Artifacts - name: Upload Firmware to Artifacts
uses: actions/upload-artifact@main uses: actions/upload-artifact@main
@ -276,93 +310,41 @@ jobs:
echo SP_LEGACY_VDI=$(echo $SP_LEGACY_VDI) >> $GITHUB_ENV echo SP_LEGACY_VDI=$(echo $SP_LEGACY_VDI) >> $GITHUB_ENV
echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV
- name: 1 Upload SP_UEFI_IMG_GZ to SharePoint - name: 1 Upload SP_UEFI_VMDK to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_IMG_GZ }}
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
sp_file_name: ${{ env.SP_UEFI_IMG_GZ }}
file: openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
- name: 2 Upload SP_UEFI_VMDK to SharePoint - name: 2 Upload SP_UEFI_VMDK to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_VMDK }}
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
sp_file_name: ${{ env.SP_UEFI_VMDK }}
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
# - name: 3 Upload SP_UEFI_VDI to SharePoint - name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint
# uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/s3-upload-github-action@master
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
# with: FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_IMG_GZ }}
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
# sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
# sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
# sp_file_name: ${{ env.SP_UEFI_VDI }}
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
# - name: 4 Upload SP_UEFI_VHDX to SharePoint - name: 6 Upload SP_LEGACY_VMDK to SharePoint
# uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/s3-upload-github-action@master
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
# with: FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_VMDK }}
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
# sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
# sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
# sp_file_name: ${{ env.SP_UEFI_VHDX }}
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }}
- name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.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://xinbao.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://xinbao.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://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
# sp_file_name: ${{ env.SP_LEGACY_VHDX }}
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VHDX }}
- name: Delete VM Disk File - name: Delete VM Disk File
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled() if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()

86
.github/workflows/X-x86_64_X_Mine.yml vendored
View File

@ -76,7 +76,7 @@ jobs:
echo "SharePoint=${{ github.event.inputs.SharePoint }}" >> $GITHUB_ENV echo "SharePoint=${{ github.event.inputs.SharePoint }}" >> $GITHUB_ENV
echo "data2=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT echo "data2=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV
export NOW_DATA_VERSION=${{env.NOW_DATA_VERSION}} export NOW_DATA_VERSION=${{env.NOW_DATA_VERSION}}
export GITHUB_WORKSPACE=$GITHUB_WORKSPACE export GITHUB_WORKSPACE=$GITHUB_WORKSPACE
@ -85,7 +85,7 @@ jobs:
if [ "${{ env.DELETE_USELESS_FILES }}" == true ] if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
then then
docker rmi node:18 node:18-alpine node:16-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest node:16 ubuntu:20.04 debian:9 debian:10 debian:11 docker rmi node:18 node:20 node:22 node:18-alpine node:20-alpine node:22-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest ubuntu:20.04 debian:10 debian:11
sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
sudo -E apt-get -y autoremove --purge sudo -E apt-get -y autoremove --purge
sudo -E apt-get clean sudo -E apt-get clean
@ -93,14 +93,6 @@ jobs:
Get_Action_Info Get_Action_Info
# - name: Maximize Build Space
# uses: easimon/maximize-build-space@master
# with:
# root-reserve-mb: 3500
# swap-size-mb: 100
# remove-dotnet: 'true'
# remove-android: 'true'
# remove-haskell: 'true'
@ -149,7 +141,8 @@ jobs:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
run: | run: |
sudo -E apt-get update sudo -E apt-get update
sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs 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 timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir sudo mkdir -p /workdir
# sudo chown $USER:$GROUPS /workdir # sudo chown $USER:$GROUPS /workdir
@ -175,6 +168,9 @@ jobs:
./scripts/feeds update -a ./scripts/feeds update -a
./scripts/feeds install -a ./scripts/feeds install -a
./scripts/feeds uninstall luci-theme-argon ./scripts/feeds uninstall luci-theme-argon
# 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 25.x feeds/packages/lang/golang
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile # sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug #fix dockerd bug
@ -184,7 +180,7 @@ jobs:
cd openwrt cd openwrt
if [ "${{ env.CACHE_ACCELERATE }}" == true ] if [ "${{ env.CACHE_ACCELERATE }}" == true ]
then then
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
fi fi
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
@ -201,7 +197,7 @@ jobs:
cd openwrt cd openwrt
./scripts/feeds install -a ./scripts/feeds install -a
make defconfig make defconfig
make download -j8 make download -j16
- name: Build OpenWrt - name: Build OpenWrt
run: | run: |
@ -209,9 +205,41 @@ jobs:
rm package/feeds/packages/adguardhome -rf rm package/feeds/packages/adguardhome -rf
rm feeds/packages/net/adguardhome -rf rm feeds/packages/net/adguardhome -rf
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
# 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 -j$(($(nproc) + 1)) | tee ./build_log.log || make -j1 V=s
make -j$(($(nproc) + 1)) || make -j1 V=s make -j$(($(nproc) + 1)) || make -j1 V=s
[ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
- name: Check Build Update
run: |
export NOW_DATA_VERSION=${{env.NOW_DATA_VERSION}}
export GITHUB_WORKSPACE=$GITHUB_WORKSPACE
bash $GITHUB_WORKSPACE/Scripts/AutoBuild_Upcheck.sh ${{env.Tempoary_FLAG}}
- name: Upload Package Version to Github Release
uses: svenstaro/upload-release-action@v2
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{env.Tempoary_FLAG}}_build_pkg_ver.log
file_glob: true
tag: v${{ steps.date.outputs.date }}
overwrite: true
- name: Upload Package Update to Github Release
uses: svenstaro/upload-release-action@v2
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{env.Tempoary_FLAG}}_build_pkg_up.log
file_glob: true
tag: v${{ steps.date.outputs.date }}
overwrite: true
- name: Process Firmware - name: Process Firmware
if: env.Result == 'true' && !cancelled() if: env.Result == 'true' && !cancelled()
run: | run: |
@ -271,10 +299,10 @@ jobs:
echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV
- name: 1 Upload SP_UEFI_IMG_GZ to SharePoint - name: 1 Upload SP_UEFI_IMG_GZ to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.3
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }} sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }} sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -282,10 +310,10 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }} file: openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
- name: 2 Upload SP_UEFI_VMDK to SharePoint - name: 2 Upload SP_UEFI_VMDK to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.3
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }} sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }} sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -293,10 +321,10 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }} file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
# - name: 3 Upload SP_UEFI_VDI to SharePoint # - name: 3 Upload SP_UEFI_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.3
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }} # sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }} # sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -304,10 +332,10 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
# - name: 4 Upload SP_UEFI_VHDX to SharePoint # - name: 4 Upload SP_UEFI_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.3
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }} # sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }} # sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -315,10 +343,10 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }} # file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }}
- name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint - name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.3
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }} sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }} sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -326,10 +354,10 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }} file: openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
- name: 6 Upload SP_LEGACY_VMDK to SharePoint - name: 6 Upload SP_LEGACY_VMDK to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.3
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }} sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }} sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -337,10 +365,10 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }} file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
# - name: 7 Upload SP_LEGACY_VDI to SharePoint # - name: 7 Upload SP_LEGACY_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.3
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }} # sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }} # sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -348,10 +376,10 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}
# - name: 8 Upload SP_LEGACY_VHDX to SharePoint # - name: 8 Upload SP_LEGACY_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.3
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }} # sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }} # sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}

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

@ -60,7 +60,7 @@ env:
jobs: jobs:
Compile: Compile:
runs-on: ubuntu-20.04 runs-on: ubuntu-latest
steps: steps:
- name: Maximize Build Space - name: Maximize Build Space
uses: easimon/maximize-build-space@master uses: easimon/maximize-build-space@master
@ -142,13 +142,13 @@ jobs:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
run: | run: |
sudo -E apt-get update sudo -E apt-get update
sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs 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 timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir sudo mkdir -p /workdir
sudo chown $USER:$GROUPS /workdir sudo chown $USER:$GROUPS /workdir
if [ "${{ env.DELETE_USELESS_FILES }}" == true ] if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
then then
docker rmi node:18 node:18-alpine node:16-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest node:16 ubuntu:20.04 debian:9 debian:10 debian:11
sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
sudo -E apt-get -y autoremove --purge sudo -E apt-get -y autoremove --purge
sudo -E apt-get clean sudo -E apt-get clean
@ -177,7 +177,7 @@ jobs:
./scripts/feeds uninstall luci-theme-argon ./scripts/feeds uninstall luci-theme-argon
# Update golang to 1.22 for xray-core build # Update golang to 1.22 for xray-core build
rm -rf feeds/packages/lang/golang rm -rf feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile # sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug #fix dockerd bug
@ -187,7 +187,7 @@ jobs:
cd openwrt cd openwrt
if [ "${{ env.CACHE_ACCELERATE }}" == true ] if [ "${{ env.CACHE_ACCELERATE }}" == true ]
then then
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
fi fi
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
@ -212,15 +212,47 @@ jobs:
rm package/feeds/packages/adguardhome -rf rm package/feeds/packages/adguardhome -rf
rm feeds/packages/net/adguardhome -rf rm feeds/packages/net/adguardhome -rf
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
make -j4 || 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
make -j4 | tee ./build_log.log || make -j1 V=s
[ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
- name: Check Build Update
run: |
export NOW_DATA_VERSION=${{env.NOW_DATA_VERSION}}
export GITHUB_WORKSPACE=$GITHUB_WORKSPACE
bash $GITHUB_WORKSPACE/Scripts/AutoBuild_Upcheck.sh ${{env.Tempoary_FLAG}}
- name: Upload Package Version to Github Release
uses: svenstaro/upload-release-action@v2
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{env.Tempoary_FLAG}}_build_pkg_ver.log
file_glob: true
tag: v${{ steps.date.outputs.date }}
overwrite: true
- name: Upload Package Update to Github Release
uses: svenstaro/upload-release-action@v2
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{env.Tempoary_FLAG}}_build_pkg_up.log
file_glob: true
tag: v${{ steps.date.outputs.date }}
overwrite: true
- name: Process Firmware - name: Process Firmware
if: env.Result == 'true' && !cancelled() if: env.Result == 'true' && !cancelled()
run: | run: |
cd openwrt cd openwrt
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
Firmware_Diy_End Firmware_Diy_End
cd ..
mkdir ${{ steps.date.outputs.date }}
cp openwrt/bin/Firmware/* ./${{ steps.date.outputs.date }} -r
- name: Upload Firmware to Artifacts - name: Upload Firmware to Artifacts
uses: actions/upload-artifact@main uses: actions/upload-artifact@main
@ -273,93 +305,41 @@ jobs:
echo SP_LEGACY_VDI=$(echo $SP_LEGACY_VDI) >> $GITHUB_ENV echo SP_LEGACY_VDI=$(echo $SP_LEGACY_VDI) >> $GITHUB_ENV
echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV
- name: 1 Upload SP_UEFI_IMG_GZ to SharePoint - name: 1 Upload SP_UEFI_VMDK to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_IMG_GZ }}
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
sp_file_name: ${{ env.SP_UEFI_IMG_GZ }}
file: openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
- name: 2 Upload SP_UEFI_VMDK to SharePoint - name: 2 Upload SP_UEFI_VMDK to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_VMDK }}
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
sp_file_name: ${{ env.SP_UEFI_VMDK }}
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
# - name: 3 Upload SP_UEFI_VDI to SharePoint - name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint
# uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/s3-upload-github-action@master
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
# with: FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_IMG_GZ }}
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
# sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
# sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
# sp_file_name: ${{ env.SP_UEFI_VDI }}
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
# - name: 4 Upload SP_UEFI_VHDX to SharePoint - name: 6 Upload SP_LEGACY_VMDK to SharePoint
# uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/s3-upload-github-action@master
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
# with: FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_VMDK }}
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
# sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
# sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
# sp_file_name: ${{ env.SP_UEFI_VHDX }}
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }}
- name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint
uses: su-dont/share-point-uploader@v2.1
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with:
sp_url: https://xinbao.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://xinbao.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://xinbao.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://xinbao.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
# sp_file_name: ${{ env.SP_LEGACY_VHDX }}
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VHDX }}
- name: Delete VM Disk File - name: Delete VM Disk File
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled() if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()

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

@ -60,7 +60,7 @@ env:
jobs: jobs:
Compile: Compile:
runs-on: ubuntu-20.04 runs-on: ubuntu-latest
steps: steps:
- name: Maximize Build Space - name: Maximize Build Space
uses: easimon/maximize-build-space@master uses: easimon/maximize-build-space@master
@ -139,13 +139,14 @@ jobs:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
run: | run: |
sudo -E apt-get update sudo -E apt-get update
sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs 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 timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir sudo mkdir -p /workdir
sudo chown $USER:$GROUPS /workdir sudo chown $USER:$GROUPS /workdir
if [ "${{ env.DELETE_USELESS_FILES }}" == true ] if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
then then
docker rmi node:18 node:18-alpine node:16-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest node:16 ubuntu:20.04 debian:9 debian:10 debian:11 docker images
sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
sudo -E apt-get -y autoremove --purge sudo -E apt-get -y autoremove --purge
sudo -E apt-get clean sudo -E apt-get clean
@ -174,7 +175,7 @@ jobs:
./scripts/feeds uninstall luci-theme-argon ./scripts/feeds uninstall luci-theme-argon
# Update golang to 1.22 for xray-core build # Update golang to 1.22 for xray-core build
rm -rf feeds/packages/lang/golang rm -rf feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 22.x feeds/packages/lang/golang git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile # sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug #fix dockerd bug
@ -184,7 +185,7 @@ jobs:
cd openwrt cd openwrt
if [ "${{ env.CACHE_ACCELERATE }}" == true ] if [ "${{ env.CACHE_ACCELERATE }}" == true ]
then then
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
fi fi
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
@ -209,15 +210,47 @@ jobs:
rm package/feeds/packages/adguardhome -rf rm package/feeds/packages/adguardhome -rf
rm feeds/packages/net/adguardhome -rf rm feeds/packages/net/adguardhome -rf
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
make -j4 || make -j1 V=s make -j4 | 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 [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
- name: Check Build Update
run: |
export NOW_DATA_VERSION=${{env.NOW_DATA_VERSION}}
export GITHUB_WORKSPACE=$GITHUB_WORKSPACE
bash $GITHUB_WORKSPACE/Scripts/AutoBuild_Upcheck.sh ${{env.Tempoary_FLAG}}
- name: Upload Package Version to Github Release
uses: svenstaro/upload-release-action@v2
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{env.Tempoary_FLAG}}_build_pkg_ver.log
file_glob: true
tag: v${{ steps.date.outputs.date }}
overwrite: true
- name: Upload Package Update to Github Release
uses: svenstaro/upload-release-action@v2
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{env.Tempoary_FLAG}}_build_pkg_up.log
file_glob: true
tag: v${{ steps.date.outputs.date }}
overwrite: true
- name: Process Firmware - name: Process Firmware
if: env.Result == 'true' && !cancelled() if: env.Result == 'true' && !cancelled()
run: | run: |
cd openwrt cd openwrt
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
Firmware_Diy_End Firmware_Diy_End
ls bin/Firmware
cd ..
mkdir ${{ steps.date.outputs.date }}
cp openwrt/bin/Firmware/* ./${{ steps.date.outputs.date }} -r
- name: Upload Firmware to Artifacts - name: Upload Firmware to Artifacts
uses: actions/upload-artifact@main uses: actions/upload-artifact@main
@ -270,33 +303,29 @@ jobs:
echo SP_LEGACY_VDI=$(echo $SP_LEGACY_VDI) >> $GITHUB_ENV echo SP_LEGACY_VDI=$(echo $SP_LEGACY_VDI) >> $GITHUB_ENV
echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV
- name: 1 Upload SP_UEFI_IMG_GZ to SharePoint - name: 1 Upload SP_UEFI_VMDK to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_UEFI_IMG_GZ }}
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
sp_file_name: ${{ env.SP_UEFI_IMG_GZ }}
file: openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
- name: 2 Upload SP_UEFI_VMDK to SharePoint - name: 2 Upload SP_UEFI_VMDK to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./${{ steps.date.outputs.date }}e/${{ env.SP_UEFI_VMDK }}
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
sp_file_name: ${{ env.SP_UEFI_VMDK }}
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
# - name: 3 Upload SP_UEFI_VDI to SharePoint # - name: 3 Upload SP_UEFI_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.3
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }} # sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }} # sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -304,43 +333,39 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
# - name: 4 Upload SP_UEFI_VHDX to SharePoint # - name: 4 Upload SP_UEFI_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.3
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }} # sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }} # sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
# sp_file_name: ${{ env.SP_UEFI_VHDX }} # sp_file_name: ${{ env.SP_UEFI_VHDX }}
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }} # file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }}
- name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint - name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_IMG_GZ }}
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
sp_file_name: ${{ env.SP_LEGACY_IMG_GZ }}
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
- name: 6 Upload SP_LEGACY_VMDK to SharePoint - name: 6 Upload SP_LEGACY_VMDK to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/s3-upload-github-action@master
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' env:
with: FILE: ./${{ steps.date.outputs.date }}/${{ env.SP_LEGACY_VMDK }}
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt S3_ENDPOINT: 's3.openwrt.115115.xyz'
sp_username: ${{ secrets.USERNAME }} S3_BUCKET: ${{ secrets.S3_BUCKET }}
sp_password: ${{ secrets.PASSWORD }} S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
sp_file_name: ${{ env.SP_LEGACY_VMDK }}
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
# - name: 7 Upload SP_LEGACY_VDI to SharePoint # - name: 7 Upload SP_LEGACY_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.3
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }} # sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }} # sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -348,10 +373,10 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}
# - name: 8 Upload SP_LEGACY_VHDX to SharePoint # - name: 8 Upload SP_LEGACY_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.3
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }} # sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }} # sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -362,6 +387,7 @@ jobs:
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled() if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
run: | run: |
rm openwrt/bin/Firmware/AutoBuild-*.v* -rf rm openwrt/bin/Firmware/AutoBuild-*.v* -rf
ls openwrt/bin/Firmware
- name: Upload Firmware to Github Release - name: Upload Firmware to Github Release
uses: svenstaro/upload-release-action@v2 uses: svenstaro/upload-release-action@v2

83
.github/workflows/X-x86_64_Z_Mine.yml vendored
View File

@ -67,7 +67,7 @@ jobs:
uses: actions/checkout@main uses: actions/checkout@main
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Set env & Echo System Info - name: Set env & Echo System Info
id: date id: date
run: | run: |
@ -92,17 +92,6 @@ jobs:
Get_Action_Info Get_Action_Info
# - name: Maximize Build Space
# uses: easimon/maximize-build-space@master
# with:
# root-reserve-mb: 3500
# swap-size-mb: 100
# remove-dotnet: 'true'
# remove-android: 'true'
# remove-haskell: 'true'
- name: Load Custom Variables - name: Load Custom Variables
run: | run: |
echo "Free space:" echo "Free space:"
@ -148,7 +137,8 @@ jobs:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
run: | run: |
sudo -E apt-get update sudo -E apt-get update
sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python2.7 python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool mkisofs 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 timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir sudo mkdir -p /workdir
# sudo chown $USER:$GROUPS /workdir # sudo chown $USER:$GROUPS /workdir
@ -174,6 +164,9 @@ jobs:
./scripts/feeds update -a ./scripts/feeds update -a
./scripts/feeds install -a ./scripts/feeds install -a
./scripts/feeds uninstall luci-theme-argon ./scripts/feeds uninstall luci-theme-argon
# 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 25.x feeds/packages/lang/golang
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile # sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug #fix dockerd bug
@ -183,7 +176,7 @@ jobs:
cd openwrt cd openwrt
if [ "${{ env.CACHE_ACCELERATE }}" == true ] if [ "${{ env.CACHE_ACCELERATE }}" == true ]
then then
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=y\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
fi fi
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
@ -208,9 +201,37 @@ jobs:
rm package/feeds/packages/adguardhome -rf rm package/feeds/packages/adguardhome -rf
rm feeds/packages/net/adguardhome -rf rm feeds/packages/net/adguardhome -rf
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
make -j8 || make -j1 V=s make -j$(($(nproc) + 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 [ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
- name: Check Build Update
run: |
export NOW_DATA_VERSION=${{env.NOW_DATA_VERSION}}
export GITHUB_WORKSPACE=$GITHUB_WORKSPACE
bash $GITHUB_WORKSPACE/Scripts/AutoBuild_Upcheck.sh ${{env.Tempoary_FLAG}}
- name: Upload Package Version to Github Release
uses: svenstaro/upload-release-action@v2
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{env.Tempoary_FLAG}}_build_pkg_ver.log
file_glob: true
tag: v${{ steps.date.outputs.date }}
overwrite: true
- name: Upload Package Update to Github Release
uses: svenstaro/upload-release-action@v2
if: env.Release=='true' && env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ${{env.Tempoary_FLAG}}_build_pkg_up.log
file_glob: true
tag: v${{ steps.date.outputs.date }}
overwrite: true
- name: Process Firmware - name: Process Firmware
if: env.Result == 'true' && !cancelled() if: env.Result == 'true' && !cancelled()
run: | run: |
@ -270,10 +291,10 @@ jobs:
echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV echo SP_LEGACY_VHDX=$(echo $SP_LEGACY_VHDX) >> $GITHUB_ENV
- name: 1 Upload SP_UEFI_IMG_GZ to SharePoint - name: 1 Upload SP_UEFI_IMG_GZ to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.3
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }} sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }} sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -281,10 +302,10 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }} file: openwrt/bin/Firmware/${{ env.SP_UEFI_IMG_GZ }}
- name: 2 Upload SP_UEFI_VMDK to SharePoint - name: 2 Upload SP_UEFI_VMDK to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.3
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }} sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }} sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -292,10 +313,10 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }} file: openwrt/bin/Firmware/${{ env.SP_UEFI_VMDK }}
# - name: 3 Upload SP_UEFI_VDI to SharePoint # - name: 3 Upload SP_UEFI_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.3
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }} # sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }} # sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -303,10 +324,10 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_UEFI_VDI }}
# - name: 4 Upload SP_UEFI_VHDX to SharePoint # - name: 4 Upload SP_UEFI_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.3
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }} # sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }} # sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -314,10 +335,10 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }} # file: openwrt/bin/Firmware/${{ env.SP_UEFI_VHDX }}
- name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint - name: 5 Upload SP_LEGACY_IMG_GZ to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.3
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }} sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }} sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -325,10 +346,10 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }} file: openwrt/bin/Firmware/${{ env.SP_LEGACY_IMG_GZ }}
- name: 6 Upload SP_LEGACY_VMDK to SharePoint - name: 6 Upload SP_LEGACY_VMDK to SharePoint
uses: su-dont/share-point-uploader@v2.1 uses: xopenwrt/share-point-uploader@v2.3
if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
with: with:
sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
sp_username: ${{ secrets.USERNAME }} sp_username: ${{ secrets.USERNAME }}
sp_password: ${{ secrets.PASSWORD }} sp_password: ${{ secrets.PASSWORD }}
sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -336,10 +357,10 @@ jobs:
file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }} file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VMDK }}
# - name: 7 Upload SP_LEGACY_VDI to SharePoint # - name: 7 Upload SP_LEGACY_VDI to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.3
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }} # sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }} # sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}
@ -347,10 +368,10 @@ jobs:
# file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }} # file: openwrt/bin/Firmware/${{ env.SP_LEGACY_VDI }}
# - name: 8 Upload SP_LEGACY_VHDX to SharePoint # - name: 8 Upload SP_LEGACY_VHDX to SharePoint
# uses: su-dont/share-point-uploader@v2.1 # uses: xopenwrt/share-point-uploader@v2.3
# if: env.SharePoint=='true' && !cancelled() && env.Result == 'true' # if: env.SharePoint=='true' && !cancelled() && env.Result == 'true'
# with: # with:
# sp_url: https://xinbao.sharepoint.com/:f:/r/sites/OpenWrt # sp_url: https://xinbyte.sharepoint.com/:f:/r/sites/OpenWrt
# sp_username: ${{ secrets.USERNAME }} # sp_username: ${{ secrets.USERNAME }}
# sp_password: ${{ secrets.PASSWORD }} # sp_password: ${{ secrets.PASSWORD }}
# sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }} # sp_folder: /Shared Documents/OpenWrt/${{ steps.date.outputs.date }}

222
.github/workflows/X-x86_64_Z_Mine_home.yml vendored Normal file
View File

@ -0,0 +1,222 @@
###########################################################
# Description: Compile OpenWrt by GitHub Actions #
# Based on: https://github.com/P3TERX/Actions-OpenWrt #
# Author: Xinb #
###########################################################
name: x86_64_Z_Mine_Home
### 以下内容请保持不变 (请修改下方的 环境变量设置)
on:
repository_dispatch:
workflow_dispatch:
inputs:
Release:
description: '是否上传到Github'
default: 'true'
SharePoint:
description: '是否上传到SharePoint'
default: 'true'
Tempoary_IP:
description: '固件 IP 地址 [可选]'
default: '192.168.2.200'
Tempoary_CONFIG:
description: '配置文件 [可选]'
default: 'x86_64-Z'
Tempoary_FLAG:
description: '固件名称后缀 [可选]'
default: 'Z'
### 结束
#push:
# branches:
# - master
#schedule:
# - cron: 0 8 * * 5
#watch:
# types: [started]
### 环境变量设置
env:
# 编译时调用的 [.config] 文件名称
CONFIG_FILE: x86_64-Z-Test
# 源码仓库:分支
DEFAULT_SOURCE: coolsnowwolf/lede:master
# 上传固件到 Github Releases
UPLOAD_RELEASES: true
# 上传固件到 Github Artifacts
UPLOAD_ARTIFACTS: false
# 上传 bin 文件夹到 Github Artifacts
UPLOAD_BIN_ARTIFACTS: false
# 删除无用文件以增加编译空间
DELETE_USELESS_FILES: false
# 删除早期的 workflow 任务
DELETE_OLD_WORKFLOW: true
# Cache 加速编译
CACHE_ACCELERATE: true
### 结束
jobs:
Compile:
runs-on: 7940hx
steps:
- name: Checkout
uses: actions/checkout@main
with:
fetch-depth: 0
- name: Set env & Echo System Info
id: date
run: |
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 "data2=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
echo "NOW_DATA_VERSION=v$(date +'%Y-%m-%d')" >> $GITHUB_ENV
export NOW_DATA_VERSION=${{env.NOW_DATA_VERSION}}
export GITHUB_WORKSPACE=$GITHUB_WORKSPACE
chmod +x $GITHUB_WORKSPACE/Scripts/AutoBuild_*.sh
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Getenv.sh
if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
then
docker rmi node:18 node:18-alpine node:16-alpine alpine:3.16 alpine:3.17 alpine:3.18 moby/buildkit:latest node:16 ubuntu:20.04 debian:9 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
fi
Get_Action_Info
- name: Load Custom Variables
run: |
echo "Free space:"
df -h
if [ -n "${{ github.event.inputs.Tempoary_CONFIG }}" ]
then
if [ -f "$GITHUB_WORKSPACE/Configs/${{ github.event.inputs.Tempoary_CONFIG }}" ]
then
CONFIG_FILE=${{ github.event.inputs.Tempoary_CONFIG }}
else
CONFIG_FILE=${{ env.CONFIG_FILE }}
fi
else
CONFIG_FILE=${{ env.CONFIG_FILE }}
fi
if [ ! -f "$GITHUB_WORKSPACE/Configs/$CONFIG_FILE" ]
then
echo "CONFIG_FILE: [/Config/$CONFIG_FILE] is not detected ..."
exit 1
else
echo "CONFIG_FILE: [/Config/$CONFIG_FILE]"
echo "CONFIG_FILE=$CONFIG_FILE" >> $GITHUB_ENV
fi
if [ -n "${{ github.event.inputs.Tempoary_IP }}" ]
then
echo "IP: [${{ github.event.inputs.Tempoary_IP }}]"
echo "Tempoary_IP=${{ github.event.inputs.Tempoary_IP }}" >> $GITHUB_ENV
fi
if [ -n "${{ github.event.inputs.Tempoary_FLAG }}" ]
then
echo "FLAG: [${{ github.event.inputs.Tempoary_FLAG }}]"
echo "Tempoary_FLAG=${{ github.event.inputs.Tempoary_FLAG }}" >> $GITHUB_ENV
fi
REPO_URL="https://github.com/$(cut -d \: -f 1 <<< ${{ env.DEFAULT_SOURCE }})"
REPO_BRANCH=$(cut -d \: -f 2 <<< ${{ env.DEFAULT_SOURCE }})
echo "REPO_URL=$REPO_URL" >> $GITHUB_ENV
echo "REPO_BRANCH=$REPO_BRANCH" >> $GITHUB_ENV
echo "Compile_Date=$(date +%Y%m%d%H%M)" >> $GITHUB_ENV
echo "Display_Date=$(date +%Y/%m/%d)" >> $GITHUB_ENV
- name: Initialization Environment
env:
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 llvm clang
sudo timedatectl set-timezone "Asia/Shanghai"
sudo mkdir -p /workdir
# sudo chown $USER:$GROUPS /workdir
- name: Clone Openwrt Source Code
run: |
git clone -b $REPO_BRANCH $REPO_URL openwrt
ln -sf /workdir/openwrt $GITHUB_WORKSPACE/openwrt
- name: Accelerate
if: env.CACHE_ACCELERATE == 'true'
uses: klever1988/cachewrtbuild@main
with:
ccache: false
toolchain: true
skip: true
clean: false
prefix: ${{ github.workspace }}/openwrt
- name: Feeds install
run: |
cd openwrt
./scripts/feeds update -a
./scripts/feeds install -a
./scripts/feeds uninstall luci-theme-argon
# 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 25.x feeds/packages/lang/golang
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug
- name: Run Diy Scripts
run: |
chmod +x Scripts/AutoBuild_*.sh
cd openwrt
if [ "${{ env.CACHE_ACCELERATE }}" == true ]
then
echo -e "\nCONFIG_DEVEL=y\nCONFIG_CCACHE=n\n" >> $GITHUB_WORKSPACE/Configs/$CONFIG_FILE
fi
cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
make defconfig
Firmware_Diy_Before
rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
Firmware_Diy_Main
Firmware_Diy
Firmware_Diy_Other
- name: Pre-download Libraries
run: |
cd openwrt
./scripts/feeds install -a
make defconfig
make download -j8
- name: Build OpenWrt
run: |
cd openwrt
rm package/feeds/packages/adguardhome -rf
rm feeds/packages/net/adguardhome -rf
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
make -j$(($(nproc) + 1)) || lscpu
# 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
- name: Process Firmware
if: env.Result == 'true' && !cancelled()
run: |
cd openwrt
source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh
Firmware_Diy_End
- name: Delete old Workflow Runs
uses: GitRML/delete-workflow-runs@main
if: env.DELETE_OLD_WORKFLOW == 'true' && !cancelled()
with:
retain_days: 1
keep_minimum_runs: 3

6
Configs/x86_64-Test
View File

@ -18,11 +18,11 @@ CONFIG_PACKAGE_hostapd-common=y
CONFIG_PACKAGE_wpa-supplicant=y CONFIG_PACKAGE_wpa-supplicant=y
# Theme # Theme
CONFIG_PACKAGE_luci-theme-atmaterial-ColorIcon=y
# CONFIG_PACKAGE_luci-theme-edge=y #
# # CONFIG_PACKAGE_luci-theme-argon is not set # # CONFIG_PACKAGE_luci-theme-argon is not set
# CONFIG_PACKAGE_luci-theme-argon-mod=y # CONFIG_PACKAGE_luci-theme-argon-mod=y
# CONFIG_PACKAGE_luci-theme-neobird=y # # CONFIG_PACKAGE_luci-theme-neobird is not set
# passwall # passwall
# CONFIG_PACKAGE_luci-app-passwall=y # CONFIG_PACKAGE_luci-app-passwall=y
# # Adguard Home # # Adguard Home

14
Configs/x86_64-X
View File

@ -12,14 +12,15 @@ CONFIG_PACKAGE_dockerd=y
CONFIG_PACKAGE_luci-lib-docker=y CONFIG_PACKAGE_luci-lib-docker=y
# Hello World # Hello World
# CONFIG_PACKAGE_luci-app-vssr=y # CONFIG_PACKAGE_luci-app-vssr=y
# Kernel 5.15 # KERNEL_PATCHVER:=6.6
CONFIG_TESTING_KERNEL=y # KERNEL_TESTING_PATCHVER:=6.12
# CONFIG_TESTING_KERNEL=y
# Theme # Theme
CONFIG_PACKAGE_luci-theme-atmaterial-ColorIcon=y
CONFIG_PACKAGE_luci-theme-bootstrap=y CONFIG_PACKAGE_luci-theme-bootstrap=y
CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-material=y
CONFIG_PACKAGE_luci-theme-neobird=y # CONFIG_PACKAGE_luci-theme-neobird is not set
CONFIG_PACKAGE_luci-theme-edge=y
# wifi # wifi
# 7625d Adapter # 7625d Adapter
@ -27,6 +28,7 @@ CONFIG_PACKAGE_iwlwifi-firmware-iwl7265d=y
# Intel 3168 Adapter # Intel 3168 Adapter
CONFIG_PACKAGE_iwlwifi-firmware-iwl3168=y CONFIG_PACKAGE_iwlwifi-firmware-iwl3168=y
CONFIG_PACKAGE_kmod-iwlwifi=y CONFIG_PACKAGE_kmod-iwlwifi=y
CONFIG_PACKAGE_kmod-fs-efivarfs=y
CONFIG_PACKAGE_hostapd=y CONFIG_PACKAGE_hostapd=y
CONFIG_PACKAGE_hostapd-common=y CONFIG_PACKAGE_hostapd-common=y
CONFIG_PACKAGE_wpa-supplicant=y CONFIG_PACKAGE_wpa-supplicant=y
@ -122,7 +124,7 @@ CONFIG_PACKAGE_luci-app-nfs=y
CONFIG_PACKAGE_luci-app-npc=y CONFIG_PACKAGE_luci-app-npc=y
CONFIG_PACKAGE_luci-app-openclash=y CONFIG_PACKAGE_luci-app-openclash=y
CONFIG_PACKAGE_luci-app-onliner=y CONFIG_PACKAGE_luci-app-onliner=y
CONFIG_PACKAGE_luci-app-passwall2=y CONFIG_PACKAGE_luci-app-passwall=y
CONFIG_PACKAGE_luci-app-pptp-server=y CONFIG_PACKAGE_luci-app-pptp-server=y
CONFIG_PACKAGE_luci-app-qbittorrent=y CONFIG_PACKAGE_luci-app-qbittorrent=y
# CONFIG_PACKAGE_luci-app-qbittorrent_dynamic is not set # CONFIG_PACKAGE_luci-app-qbittorrent_dynamic is not set

11
Configs/x86_64-Y
View File

@ -4,16 +4,17 @@ CONFIG_PACKAGE_davfs2=y
CONFIG_PACKAGE_smartdns=y CONFIG_PACKAGE_smartdns=y
CONFIG_PACKAGE_luci-app-smartdns=y CONFIG_PACKAGE_luci-app-smartdns=y
CONFIG_PACKAGE_luci-i18n-smartdns-zh-cn=y CONFIG_PACKAGE_luci-i18n-smartdns-zh-cn=y
# Kernel 5.10 # KERNEL_PATCHVER:=6.6
# KERNEL_TESTING_PATCHVER:=6.12
# CONFIG_TESTING_KERNEL=y # CONFIG_TESTING_KERNEL=y
# Theme # Theme
CONFIG_PACKAGE_luci-theme-atmaterial-ColorIcon=y
# CONFIG_PACKAGE_luci-theme-argon is not set # CONFIG_PACKAGE_luci-theme-argon is not set
CONFIG_PACKAGE_luci-theme-argon-mod=y CONFIG_PACKAGE_luci-theme-argon-mod=y
CONFIG_PACKAGE_luci-theme-neobird=y # CONFIG_PACKAGE_luci-theme-neobird is not set
CONFIG_PACKAGE_luci-theme-edge=y
# passwall # passwall
CONFIG_PACKAGE_luci-app-passwall2=y CONFIG_PACKAGE_luci-app-passwall=y
# Adguard Home # Adguard Home
CONFIG_PACKAGE_luci-app-adguardhome=y CONFIG_PACKAGE_luci-app-adguardhome=y
CONFIG_PACKAGE_adguardhome=y CONFIG_PACKAGE_adguardhome=y

21
Configs/x86_64-Z
View File

@ -9,24 +9,33 @@ CONFIG_PACKAGE_luci-i18n-smartdns-zh-cn=y
CONFIG_IB=y CONFIG_IB=y
CONFIG_IB_STANDALONE=y CONFIG_IB_STANDALONE=y
# Kernel 5.4 # KERNEL_PATCHVER:=6.6
# KERNEL_TESTING_PATCHVER:=6.12
# CONFIG_TESTING_KERNEL=y # CONFIG_TESTING_KERNEL=y
# Theme # Theme
CONFIG_PACKAGE_luci-theme-atmaterial-ColorIcon=y
CONFIG_PACKAGE_luci-theme-edge=y
# CONFIG_PACKAGE_luci-theme-argon is not set # CONFIG_PACKAGE_luci-theme-argon is not set
CONFIG_PACKAGE_luci-theme-argon-mod=y CONFIG_PACKAGE_luci-theme-argon-mod=y
CONFIG_PACKAGE_luci-theme-neobird=y # CONFIG_PACKAGE_luci-theme-neobird is not set
# passwall # passwall
CONFIG_PACKAGE_luci-app-passwall2=y CONFIG_PACKAGE_luci-app-passwall=y
# Adguard Home # Adguard Home
CONFIG_PACKAGE_luci-app-adguardhome=y CONFIG_PACKAGE_luci-app-adguardhome=y
CONFIG_PACKAGE_adguardhome=y CONFIG_PACKAGE_adguardhome=y
# Dnsmasq 及IPV6,AutoUpdate # Dnsmasq 及IPV6,AutoUpdate
CONFIG_PACKAGE_dnsmasq-full=y CONFIG_PACKAGE_dnsmasq-full=y
CONFIG_PACKAGE_dnsmasq_full_dhcp=y CONFIG_PACKAGE_dnsmasq_full_dhcp=y
CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y
CONFIG_PACKAGE_luci-app-autoupdate=y CONFIG_PACKAGE_luci-app-autoupdate=y
# IPv6 支持
CONFIG_IPV6=y
CONFIG_KERNEL_IPV6=y
CONFIG_PACKAGE_ipv6helper=y
CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y
CONFIG_PACKAGE_6in4=y
CONFIG_PACKAGE_6rd=y
CONFIG_PACKAGE_6to4=y
# Netdata # Netdata
CONFIG_PACKAGE_luci-app-netdata=y CONFIG_PACKAGE_luci-app-netdata=y
# Diskman # Diskman

83
Configs/x86_64-Z-Test Normal file
View File

@ -0,0 +1,83 @@
# 挂载WebDav
CONFIG_PACKAGE_davfs2=y
# Smart DNS
CONFIG_PACKAGE_smartdns=y
CONFIG_PACKAGE_luci-app-smartdns=y
CONFIG_PACKAGE_luci-i18n-smartdns-zh-cn=y
# Image Builder
CONFIG_IB=y
CONFIG_IB_STANDALONE=y
# KERNEL_PATCHVER:=6.6
# KERNEL_TESTING_PATCHVER:=6.1
CONFIG_TESTING_KERNEL=y
# Theme
# CONFIG_PACKAGE_luci-theme-argon is not set
CONFIG_PACKAGE_luci-theme-argon-mod=y
# CONFIG_PACKAGE_luci-theme-neobird is not set
# passwall
CONFIG_PACKAGE_luci-app-passwall2=y
# Adguard Home
CONFIG_PACKAGE_luci-app-adguardhome=y
CONFIG_PACKAGE_adguardhome=y
# Dnsmasq 及IPV6,AutoUpdate
CONFIG_PACKAGE_dnsmasq-full=y
CONFIG_PACKAGE_dnsmasq_full_dhcp=y
CONFIG_PACKAGE_luci-app-autoupdate=y
# IPv6 支持
CONFIG_IPV6=y
CONFIG_KERNEL_IPV6=y
CONFIG_PACKAGE_ipv6helper=y
CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y
CONFIG_PACKAGE_6in4=y
CONFIG_PACKAGE_6rd=y
CONFIG_PACKAGE_6to4=y
# KMS
CONFIG_PACKAGE_vlmcsd=y
CONFIG_PACKAGE_luci-i18n-vlmcsd-zh-cn=y
CONFIG_PACKAGE_luci-app-vlmcsd=y
# Netdata
CONFIG_PACKAGE_luci-app-netdata=y
# Diskman
CONFIG_PACKAGE_luci-app-diskman=y
CONFIG_PACKAGE_luci-app-diskman_INCLUDE_btrfs_progs=y
CONFIG_PACKAGE_luci-app-diskman_INCLUDE_lsblk=y
CONFIG_PACKAGE_luci-app-diskman_INCLUDE_mdadm=y
CONFIG_TARGET_x86=y
CONFIG_TARGET_x86_64=y
CONFIG_TARGET_x86_64_DEVICE_generic=y
CONFIG_GRUB_IMAGES=y
CONFIG_VMDK_IMAGES=y
CONFIG_VDI_IMAGES=y
CONFIG_VHDX_IMAGES=y
CONFIG_GRUB_TITLE="OpenWrt for x86_64-Z & Powered by Xinb"
CONFIG_TARGET_KERNEL_PARTSIZE=32
CONFIG_TARGET_ROOTFS_PARTSIZE=800
# CONFIG_GRUB_CONSOLE is not set
CONFIG_TARGET_IMAGES_GZIP=y
CONFIG_PACKAGE_ntfs3-mount=y
# CONFIG_SIGNATURE_CHECK is not set
# CONFIG_SIGNED_PACKAGES is not set
# CONFIG_PACKAGE_luci-app-unblockmusic is not set
# CONFIG_PACKAGE_luci-app-unblockmusic_INCLUDE_UnblockNeteaseMusic_Go is not set
# CONFIG_PACKAGE_luci-app-unblockmusic_INCLUDE_UnblockNeteaseMusic_NodeJS is not set
# CONFIG_PACKAGE_luci-app-adbyby-plus is not set
# CONFIG_PACKAGE_adbyby is not set
# CONFIG_PACKAGE_luci-app-wireguard is not set
# CONFIG_PACKAGE_luci-app-ssr-plus is not set
# CONFIG_PACKAGE_luci-app-wol is not set
# CONFIG_PACKAGE_luci-app-xlnetacc is not set
# CONFIG_PACKAGE_luci-app-upnp is not set
# CONFIG_PACKAGE_luci-app-qbittorrent is not set
# CONFIG_PACKAGE_luci-app-vsftpd is not set
# CONFIG_PACKAGE_luci-app-samba is not set
# CONFIG_PACKAGE_autosamba is not set

4
Scripts/AutoBuild_DiyScript.sh
View File

@ -78,7 +78,7 @@ EOF
done ; unset i done ; unset i
AddPackage svn apps minieap immortalwrt openwrt-18.06 packages net AddPackage svn apps minieap immortalwrt openwrt-18.06 packages net
AddPackage git other luci-theme-atmaterial-ColorIcon esirplayground master # AddPackage git other luci-theme-atmaterial-ColorIcon esirplayground master
AddPackage git lean luci-app-argon-config jerrykuku master AddPackage git lean luci-app-argon-config jerrykuku master
AddPackage git other OpenClash vernesong master AddPackage git other OpenClash vernesong master
# AddPackage git other luci-app-vssr jerrykuku master # AddPackage git other luci-app-vssr jerrykuku master
@ -123,7 +123,7 @@ EOF
sed -i -- 's:/bin/ash:'/bin/bash':g' ${BASE_FILES}/etc/passwd sed -i -- 's:/bin/ash:'/bin/bash':g' ${BASE_FILES}/etc/passwd
#sed -i "s?6.0?5.19?g" ${WORK}/target/linux/x86/Makefile #sed -i "s?6.0?5.19?g" ${WORK}/target/linux/x86/Makefile
# patch < ${CustomFiles}/Patches/upgrade_intel_igpu_drv.patch -p1 -d ${WORK} # patch < ${CustomFiles}/Patches/upgrade_intel_igpu_drv.patch -p1 -d ${WORK}
patch < ${CustomFiles}/Patches/fix_mac80211.patch -p1 -d ${WORK} # patch < ${CustomFiles}/Patches/fix_mac80211.patch -p1 -d ${WORK}
#fix hostapd #fix hostapd
sed -i "s/\#CONFIG_AP/CONFIG_AP/g" ${WORK}/package/network/services/hostapd/files/wpa* sed -i "s/\#CONFIG_AP/CONFIG_AP/g" ${WORK}/package/network/services/hostapd/files/wpa*
;; ;;

5
Scripts/AutoBuild_Function.sh
View File

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

3
Scripts/AutoBuild_Getenv.sh
View File

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

121
Scripts/AutoBuild_Upcheck.sh Normal file
View File

@ -0,0 +1,121 @@
#!/bin/bash
Check_build_Version(){
pkg_line=$1
X_BUILD_TAG=$2
pkg_name=${pkg_line%=*}
pkg_new_version=${pkg_line#*=}
pkg_info=`cat ${X_BUILD_TAG}_build_pkg_ver_old.log | grep "^$pkg_name=" -m 1 `
pkg_old_version=${pkg_info#*=}
if [ "$pkg_old_version" != "$pkg_new_version" ]
then
if [ "$pkg_old_version" != "" ]
then
echo ${pkg_name}:"$pkg_old_version>>$pkg_new_version" >> ${X_BUILD_TAG}_build_pkg_up.log
echo ${pkg_name}:"$pkg_old_version>>$pkg_new_version"
else
echo "Add ${pkg_name}:${pkg_new_version}" >> ${X_BUILD_TAG}_build_pkg_up.log
fi
fi
}
cat openwrt/build_log.log | grep -v "host-compile" |grep "make\[3\]" | grep -E "package/|feeds/" > build_cmd.log
cat build_cmd.log | awk '{print substr($3,1)}' > build_package.log
X_LINUX_VERSION=`cat openwrt/target/linux/x86/Makefile | grep KERNEL_PATCHVER:=`
X_LINUX_VERSION_TESTING=`cat openwrt/target/linux/x86/Makefile | grep KERNEL_TESTING_PATCHVER:=`
X_LINUX_VERSION=${X_LINUX_VERSION#*=}
X_LINUX_VERSION_TESTING=${X_LINUX_VERSION_TESTING#*=}
echo LINUX_VERSION=${X_LINUX_VERSION} > ${1}_build_pkg_ver.log
echo LINUX_VERSION_TESTING=${X_LINUX_VERSION_TESTING} >> ${1}_build_pkg_ver.log
while read -r build_pkg_dir
do
build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep "\bPKG_VERSION:=" -m 1`
if [ "${build_pkg_dir##*/}" = "dnsmasq" ]
then
build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep PKG_UPSTREAM_VERSION:= -m 1`
fi
if [ "${build_pkg_dir##*/}" = "ppp" ]
then
build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep PKG_RELEASE_VERSION:= -m 1`
fi
if [ "${build_pkg_dir##*/}" = "bpf-headers" ]
then
build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep PKG_PATCHVER:= -m 1`
fi
if [ "${build_pkg_dir##*/}" = "dsl-vrx200-firmware-xdsl" ]
then
build_pkg_ver=""
fi
if [ "${build_pkg_dir##*/}" = "UnblockNeteaseMusic" ]
then
build_pkg_ver=""
fi
if [ "${build_pkg_dir##*/}" = "perf" ]
then
build_pkg_ver=${X_LINUX_VERSION}
fi
if [ "${build_pkg_dir##*/}" = "golang" ]
then
build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep GO_VERSION_MAJOR_MINOR:= -m 1`
build_pkg_ver=${build_pkg_ver#*=}
GO_VERSION_PATCH=`cat openwrt/${build_pkg_dir}/Makefile | grep GO_VERSION_PATCH:= -m 1`
GO_VERSION_PATCH=${GO_VERSION_PATCH#*=}
build_pkg_ver=${build_pkg_ver}.${GO_VERSION_PATCH}
fi
if [ "$build_pkg_ver" = "" ]
then
build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep "\bPKG_VERSION=" -m 1`
fi
if [ "$build_pkg_ver" = "" ]
then
build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep "\bPKG_RELEASE:=" -m 1`
fi
if [ "$build_pkg_ver" = "" ]
then
build_pkg_ver=`cat openwrt/${build_pkg_dir}/Makefile | grep "\bPKG_RELEASE=" -m 1`
fi
build_pkg_ver=${build_pkg_ver#*=}
echo ${build_pkg_dir##*/}=$build_pkg_ver >> ${1}_build_pkg_ver.log
done < "build_package.log"
# export NOW_DATA_VERSION=${{env.NOW_DATA_VERSION}}
# export GITHUB_WORKSPACE=$GITHUB_WORKSPACE
wget https://api.github.com/repos/X-OpenWrt/X-OpenWrt-Dev/releases -O releases.json
cat releases.json | jq '.[].tag_name' -r > version.old
echo ${NOW_DATA_VERSION}
diff_version=v2023-1-1
while read -r last_version
do
if [[ "$last_version" != "AutoUpdate" ]]
then
if [[ "$last_version" < ${NOW_DATA_VERSION} ]]
then
if [[ "$last_version" > ${diff_version} ]]
then
diff_version=$last_version
fi
fi
fi
done < "version.old"
wget -O ${1}_build_pkg_ver_old.log https://github.com/X-OpenWrt/X-OpenWrt-Dev/releases/download/${diff_version}/${1}_build_pkg_ver.log
# Check_build_Version "LINUX_VERSION=${X_LINUX_VERSION}" ${1}
echo "Tag:${1} Vesion Check" >> ${1}_build_pkg_up.log
while read -r make_version_line
do
Check_build_Version $make_version_line ${1}
done < "${1}_build_pkg_ver.log"