From 0c3a1cbaa5130bb64790b1b44dd0e5edab1b1a48 Mon Sep 17 00:00:00 2001
From: lingyuzeng <pylyzeng@gmail.com>
Date: Sun, 1 Mar 2026 18:10:48 +0800
Subject: [PATCH] fix(ci): use shell-expanded WORKSPACE paths

Avoid Woodpecker pre-expanding ${WORKSPACE} before shell export.\n\nUse runtime $WORKSPACE expansion in step commands so script/config paths resolve to the CI workspace instead of /Scripts/... .
---
 .woodpecker/ipq60xx.yml | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/.woodpecker/ipq60xx.yml b/.woodpecker/ipq60xx.yml
index d7312d4..1e5f805 100644
--- a/.woodpecker/ipq60xx.yml
+++ b/.woodpecker/ipq60xx.yml
@@ -29,8 +29,8 @@ steps:
       UPSTREAM_GENERAL_REF: ${UPSTREAM_GENERAL_REF:-main}
     commands:
       - export WORKSPACE="${CI_WORKSPACE:-$PWD}"
-      - chmod +x ${WORKSPACE}/Scripts/sync_upstream_config.sh
-      - ${WORKSPACE}/Scripts/sync_upstream_config.sh
+      - chmod +x $WORKSPACE/Scripts/sync_upstream_config.sh
+      - $WORKSPACE/Scripts/sync_upstream_config.sh
 
   - name: build-ipq60xx-wifi-yes
     image: ubuntu:24.04
@@ -44,21 +44,21 @@ steps:
       - ./scripts/feeds install -a
 
       - cd package
-      - dos2unix ${WORKSPACE}/Scripts/*.sh || true
-      - chmod +x ${WORKSPACE}/Scripts/*.sh
-      - ${WORKSPACE}/Scripts/Packages.sh ${WORKSPACE}/Scripts/Handles.sh
+      - dos2unix $WORKSPACE/Scripts/*.sh || true
+      - chmod +x $WORKSPACE/Scripts/*.sh
+      - $WORKSPACE/Scripts/Packages.sh $WORKSPACE/Scripts/Handles.sh
 
       - cd ..
-      - cat ${WORKSPACE}/Config/IPQ60XX-WIFI-YES.txt \
-            ${WORKSPACE}/Config/GENERAL.upstream.txt \
-            ${WORKSPACE}/Config/GENERAL.local.txt > .config
-      - ${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 ${WORKSPACE}/artifacts/ipq60xx-wifi-yes
-      - cp -rf bin/targets ${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
@@ -72,18 +72,18 @@ steps:
       - ./scripts/feeds install -a
 
       - cd package
-      - dos2unix ${WORKSPACE}/Scripts/*.sh || true
-      - chmod +x ${WORKSPACE}/Scripts/*.sh
-      - ${WORKSPACE}/Scripts/Packages.sh ${WORKSPACE}/Scripts/Handles.sh
+      - dos2unix $WORKSPACE/Scripts/*.sh || true
+      - chmod +x $WORKSPACE/Scripts/*.sh
+      - $WORKSPACE/Scripts/Packages.sh $WORKSPACE/Scripts/Handles.sh
 
       - cd ..
-      - cat ${WORKSPACE}/Config/IPQ60XX-WIFI.txt \
-            ${WORKSPACE}/Config/GENERAL.upstream.txt \
-            ${WORKSPACE}/Config/GENERAL.local.txt > .config
-      - ${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 ${WORKSPACE}/artifacts/ipq60xx-wifi
-      - cp -rf bin/targets ${WORKSPACE}/artifacts/ipq60xx-wifi/
+      - mkdir -p $WORKSPACE/artifacts/ipq60xx-wifi
+      - cp -rf bin/targets $WORKSPACE/artifacts/ipq60xx-wifi/