normalize workflow parallelism

This commit is contained in:
xopenwrt 2026-06-29 22:09:33 +08:00
parent d8063acc06
commit 2f177ace71
4 changed files with 30 additions and 6 deletions

View File

@ -64,6 +64,10 @@ env:
DELETE_OLD_WORKFLOW: true DELETE_OLD_WORKFLOW: true
# Cache 加速编译 # Cache 加速编译
CACHE_ACCELERATE: true CACHE_ACCELERATE: true
# 下载并行数
DOWNLOAD_JOBS: 8
# 编译并行数
BUILD_JOBS: 4
### 结束 ### 结束
jobs: jobs:
@ -219,7 +223,7 @@ jobs:
cd openwrt cd openwrt
./scripts/feeds install -a ./scripts/feeds install -a
make defconfig make defconfig
make download -j32 make download -j${DOWNLOAD_JOBS}
- name: Build OpenWrt - name: Build OpenWrt
run: | run: |
@ -233,7 +237,7 @@ jobs:
# 2024.03.03 mosdns build fail by golang 1.22 # 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 sed -i "s/CGO_ENABLED=0/CGO_ENABLED=1/g" feeds/packages/net/mosdns/Makefile
set -o pipefail set -o pipefail
if make -j4 2>&1 | tee ./build_log.log if make -j${BUILD_JOBS} 2>&1 | tee ./build_log.log
then then
build_status=0 build_status=0
else else

View File

@ -64,6 +64,10 @@ env:
DELETE_OLD_WORKFLOW: true DELETE_OLD_WORKFLOW: true
# Cache 加速编译 # Cache 加速编译
CACHE_ACCELERATE: true CACHE_ACCELERATE: true
# 下载并行数
DOWNLOAD_JOBS: 8
# 编译并行数
BUILD_JOBS: 4
### 结束 ### 结束
jobs: jobs:
@ -216,7 +220,7 @@ jobs:
cd openwrt cd openwrt
./scripts/feeds install -a ./scripts/feeds install -a
make defconfig make defconfig
make download -j8 make download -j${DOWNLOAD_JOBS}
- name: Build OpenWrt - name: Build OpenWrt
run: | run: |
@ -230,7 +234,7 @@ jobs:
# 2024.03.03 mosdns build fail by golang 1.22 # 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 sed -i "s/CGO_ENABLED=0/CGO_ENABLED=1/g" feeds/packages/net/mosdns/Makefile
set -o pipefail set -o pipefail
if make -j4 2>&1 | tee ./build_log.log if make -j${BUILD_JOBS} 2>&1 | tee ./build_log.log
then then
build_status=0 build_status=0
else else

View File

@ -64,6 +64,10 @@ env:
DELETE_OLD_WORKFLOW: true DELETE_OLD_WORKFLOW: true
# Cache 加速编译 # Cache 加速编译
CACHE_ACCELERATE: true CACHE_ACCELERATE: true
# 下载并行数
DOWNLOAD_JOBS: 8
# 编译并行数
BUILD_JOBS: 4
### 结束 ### 结束
jobs: jobs:
@ -214,7 +218,7 @@ jobs:
cd openwrt cd openwrt
./scripts/feeds install -a ./scripts/feeds install -a
make defconfig make defconfig
make download -j8 make download -j${DOWNLOAD_JOBS}
- name: Build OpenWrt - name: Build OpenWrt
run: | run: |
@ -228,7 +232,7 @@ jobs:
# 2024.03.03 mosdns build fail by golang 1.22 # 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 sed -i "s/CGO_ENABLED=0/CGO_ENABLED=1/g" feeds/packages/net/mosdns/Makefile
set -o pipefail set -o pipefail
if make -j4 2>&1 | tee ./build_log.log if make -j${BUILD_JOBS} 2>&1 | tee ./build_log.log
then then
build_status=0 build_status=0
else else

View File

@ -0,0 +1,12 @@
# AI Modification Log: Workflow Parallelism Variables
Date: 2026-06-29
## Change
- Added `DOWNLOAD_JOBS: 8` and `BUILD_JOBS: 4` to X/Y/Z workflow env blocks.
- Replaced hard-coded `make download -j32` / `-j8` and `make -j4` with those variables.
## Reason
X/Y/Z had drifted download parallelism while sharing the same build logic. Central variables keep the workflows consistent and make later tuning explicit.