ci(woodpecker): harden workspace path and sync local config
Some checks failed
ci/woodpecker/push/ipq60xx Pipeline failed

- Use WORKSPACE fallback when CI_WORKSPACE is missing to avoid /Scripts path errors\n- Replace GENERAL.local.txt with maintained OpenWRT-CI local package/config set
This commit is contained in:
2026-03-01 17:50:04 +08:00
parent e35d1592f9
commit 997746829f
2 changed files with 157 additions and 25 deletions

View File

@@ -28,59 +28,62 @@ steps:
DEBIAN_FRONTEND: noninteractive
UPSTREAM_GENERAL_REF: ${UPSTREAM_GENERAL_REF:-main}
commands:
- chmod +x ${CI_WORKSPACE}/Scripts/sync_upstream_config.sh
- ${CI_WORKSPACE}/Scripts/sync_upstream_config.sh
- export WORKSPACE="${CI_WORKSPACE:-$PWD}"
- chmod +x ${WORKSPACE}/Scripts/sync_upstream_config.sh
- ${WORKSPACE}/Scripts/sync_upstream_config.sh
- name: build-ipq60xx-wifi-yes
image: ubuntu:24.04
environment:
DEBIAN_FRONTEND: noninteractive
commands:
- export WORKSPACE="${CI_WORKSPACE:-$PWD}"
- git clone --depth=1 --single-branch --branch ${WRT_BRANCH} ${WRT_REPO} wrt-yes
- cd wrt-yes
- ./scripts/feeds update -a
- ./scripts/feeds install -a
- cd package
- dos2unix ${CI_WORKSPACE}/Scripts/*.sh || true
- chmod +x ${CI_WORKSPACE}/Scripts/*.sh
- ${CI_WORKSPACE}/Scripts/Packages.sh ${CI_WORKSPACE}/Scripts/Handles.sh
- dos2unix ${WORKSPACE}/Scripts/*.sh || true
- chmod +x ${WORKSPACE}/Scripts/*.sh
- ${WORKSPACE}/Scripts/Packages.sh ${WORKSPACE}/Scripts/Handles.sh
- cd ..
- cat ${CI_WORKSPACE}/Config/IPQ60XX-WIFI-YES.txt \
${CI_WORKSPACE}/Config/GENERAL.upstream.txt \
${CI_WORKSPACE}/Config/GENERAL.local.txt > .config
- ${CI_WORKSPACE}/Scripts/Settings.sh
- cat ${WORKSPACE}/Config/IPQ60XX-WIFI-YES.txt \
${WORKSPACE}/Config/GENERAL.upstream.txt \
${WORKSPACE}/Config/GENERAL.local.txt > .config
- ${WORKSPACE}/Scripts/Settings.sh
- make defconfig -j"$(nproc)"
- make download -j"$(nproc)"
- make -j"$(nproc)" || make -j1 V=s
- mkdir -p ${CI_WORKSPACE}/artifacts/ipq60xx-wifi-yes
- cp -rf bin/targets ${CI_WORKSPACE}/artifacts/ipq60xx-wifi-yes/
- mkdir -p ${WORKSPACE}/artifacts/ipq60xx-wifi-yes
- cp -rf bin/targets ${WORKSPACE}/artifacts/ipq60xx-wifi-yes/
- name: build-ipq60xx-wifi
image: ubuntu:24.04
environment:
DEBIAN_FRONTEND: noninteractive
commands:
- export WORKSPACE="${CI_WORKSPACE:-$PWD}"
- git clone --depth=1 --single-branch --branch ${WRT_BRANCH} ${WRT_REPO} wrt-wifi
- cd wrt-wifi
- ./scripts/feeds update -a
- ./scripts/feeds install -a
- cd package
- dos2unix ${CI_WORKSPACE}/Scripts/*.sh || true
- chmod +x ${CI_WORKSPACE}/Scripts/*.sh
- ${CI_WORKSPACE}/Scripts/Packages.sh ${CI_WORKSPACE}/Scripts/Handles.sh
- dos2unix ${WORKSPACE}/Scripts/*.sh || true
- chmod +x ${WORKSPACE}/Scripts/*.sh
- ${WORKSPACE}/Scripts/Packages.sh ${WORKSPACE}/Scripts/Handles.sh
- cd ..
- cat ${CI_WORKSPACE}/Config/IPQ60XX-WIFI.txt \
${CI_WORKSPACE}/Config/GENERAL.upstream.txt \
${CI_WORKSPACE}/Config/GENERAL.local.txt > .config
- ${CI_WORKSPACE}/Scripts/Settings.sh
- cat ${WORKSPACE}/Config/IPQ60XX-WIFI.txt \
${WORKSPACE}/Config/GENERAL.upstream.txt \
${WORKSPACE}/Config/GENERAL.local.txt > .config
- ${WORKSPACE}/Scripts/Settings.sh
- make defconfig -j"$(nproc)"
- make download -j"$(nproc)"
- make -j"$(nproc)" || make -j1 V=s
- mkdir -p ${CI_WORKSPACE}/artifacts/ipq60xx-wifi
- cp -rf bin/targets ${CI_WORKSPACE}/artifacts/ipq60xx-wifi/
- mkdir -p ${WORKSPACE}/artifacts/ipq60xx-wifi
- cp -rf bin/targets ${WORKSPACE}/artifacts/ipq60xx-wifi/