Fixes for west args from snippets.

petejohanson · Mar 24, 2024 · a1128fa · a1128fa
1 parent e0fc77f
commit a1128fa
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/.github/workflows/build-user-config.yml b/.github/workflows/build-user-config.yml
@@ -79,11 +79,10 @@ jobs:
             echo "base_dir=${GITHUB_WORKSPACE}" >> $GITHUB_ENV
           fi
 
-          echo ".include[${job_index}].snippets"
-
-          yaml2json "${{ inputs.build_matrix_path }}" | jq -c ".include[${job_index}].snippets"
+          extra_west_args=(yaml2json "${{ inputs.build_matrix_path }}" | jq -r -c ".include[${job_index}].snippets | map(\"-S \" +.) | join(\" \")")
 
           echo "zephyr_version=${ZEPHYR_VERSION}" >> $GITHUB_ENV
+          echo "extra_west_args=${extra_west_args}" >> $GITHUB_ENV
           echo "extra_cmake_args=${shield:+-DSHIELD=\"$shield\"}${zmk_load_arg}" >> $GITHUB_ENV
           echo "display_name=${shield:+$shield - }${board}" >> $GITHUB_ENV
           echo "artifact_name=${artifact_name:-${shield:+$shield-}${board}-zmk}" >> $GITHUB_ENV
@@ -128,7 +127,7 @@ jobs:
       - name: West Build (${{ env.display_name }})
         working-directory: ${{ env.base_dir }}
         shell: sh -x {0}
-        run: west build -s zmk/app -d "${{ env.build_dir }}" -b "${{ matrix.board }}" -- -DZMK_CONFIG=${{ env.base_dir }}/${{ inputs.config_path }} ${{ env.extra_cmake_args }} ${{ matrix.cmake-args }}
+        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 }}
 
       - name: ${{ env.display_name }} Kconfig file
         run: |