From 471d97809a2ea1a9f09a8b057cf63e9c09048608 Mon Sep 17 00:00:00 2001
From: Grzegorz Milka <grzegorzmilka@gmail.com>
Date: Fri, 23 Jan 2026 19:18:57 +0100
Subject: [PATCH] fix(ci): update West working directory

Previously the workflow only works if `config_path` is a single
directory. If we use something different, e.g., `config_path:
"dot_config/zmk/config"`, West fails with

```
Run west init -l "/__w/dotfiles/dotfiles/dot_config/corne-zmk/config"
  west init -l "/__w/dotfiles/dotfiles/dot_config/corne-zmk/config"
  shell: sh -e {0}
  env:
    build_dir: /tmp/tmp.a9rTeptW6V
    base_dir: /__w/dotfiles/dotfiles
    zephyr_version: 4.1.0
    extra_west_args:
    extra_cmake_args: -DSHIELD="corne_right nice_view_adapter nice_view"
    display_name: corne_right nice_view_adapter nice_view - nice_nano_v2
    artifact_name: corne_right nice_view_adapter nice_view-nice_nano_v2-zmk
=== Initializing from existing manifest repository config
--- Creating /__w/dotfiles/dotfiles/dot_config/corne-zmk/.west and local configuration file
=== Initialized. Now run "west update" inside /__w/dotfiles/dotfiles/dot_config/corne-zmk.

Run west update --fetch-opt=--filter=tree:0
FATAL ERROR: no west workspace found from "/__w/dotfiles/dotfiles"; "west update" requires one.
Things to try:
  - Change directory to somewhere inside a west workspace and retry.
  - Set ZEPHYR_BASE to a zephyr repository path in a west workspace.
  - Run "west init" to set up a workspace here.
  - Run "west init -h" for additional information.
```

This commit fixes the issue by introducing `west_working_directory` that
points to the dirname of `config_path`.
---
 .github/workflows/build-user-config.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-user-config.yml b/.github/workflows/build-user-config.yml
index 3f0527fbc..cc3866c33 100644
--- a/.github/workflows/build-user-config.yml
+++ b/.github/workflows/build-user-config.yml
@@ -78,6 +78,7 @@ jobs:
           else
             echo "base_dir=${GITHUB_WORKSPACE}" >> $GITHUB_ENV
           fi
+          echo "west_working_dir=${GITHUB_WORKSPACE}/$(dirname ${{ inputs.config_path }})" >> $GITHUB_ENV
 
           if [ -n "${snippet}" ]; then
             extra_west_args="-S \"${snippet}\""
@@ -103,11 +104,11 @@ jobs:
           cache_name: cache-zephyr-${{ env.zephyr_version }}-modules
         with:
           path: |
-            ${{ env.base_dir }}/modules/
-            ${{ env.base_dir }}/tools/
-            ${{ env.base_dir }}/zephyr/
-            ${{ env.base_dir }}/bootloader/
-            ${{ env.base_dir }}/zmk/
+            ${{ env.west_working_dir }}/modules/
+            ${{ env.west_working_dir }}/tools/
+            ${{ env.west_working_dir }}/zephyr/
+            ${{ env.west_working_dir }}/bootloader/
+            ${{ env.west_working_dir }}/zmk/
           key: ${{ runner.os }}-build-${{ env.cache_name }}-${{ hashFiles('**/west.yml', '**/build.yaml') }}
           restore-keys: |
             ${{ runner.os }}-build-${{ env.cache_name }}-
@@ -119,22 +120,22 @@ jobs:
         run: west init -l "${{ env.base_dir }}/${{ inputs.config_path }}"
 
       - name: West Update
-        working-directory: ${{ env.base_dir }}
+        working-directory: ${{ env.west_working_dir }}
         run: west update --fetch-opt=--filter=tree:0
 
       - name: Check ZMK revision
-        working-directory: ${{ env.base_dir }}
+        working-directory: ${{ env.west_working_dir }}
         run: |
           zmk_revision=$(west list -f "{revision}" zmk)
           echo "zmk_revision=${zmk_revision}" >> $GITHUB_ENV
           echo "ZMK revision: ${zmk_revision}"
 
       - name: West Zephyr export
-        working-directory: ${{ env.base_dir }}
+        working-directory: ${{ env.west_working_dir }}
         run: west zephyr-export
 
       - name: West Build (${{ env.display_name }})
-        working-directory: ${{ env.base_dir }}
+        working-directory: ${{ env.west_working_dir }}
         shell: sh -x {0}
         run: west build -s zmk/app -d "${{ env.build_dir }}" -b "${{ matrix.board }}" ${{ env.extra_west_args }} -- -DZMK_CONFIG=${{ env.base_dir }}/${{ inputs.config_path }} ${{ env.extra_cmake_args }} ${{ matrix.cmake-args }}