From 458f9ef58ddef7c96033a1f68b073730b33e6b3a Mon Sep 17 00:00:00 2001 From: dijunkun Date: Sat, 7 Nov 2026 02:01:06 +0800 Subject: [PATCH] [fix] use native Windows shell for CLI dependencies --- .github/workflows/build-cli.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml index 9fe26974..a44eea14 100644 --- a/.github/workflows/build-cli.yml +++ b/.github/workflows/build-cli.yml @@ -95,10 +95,11 @@ jobs: fi - name: Prepare pinned dependency run: sh apps/cli/scripts/prepare-deps.sh + # Use the runner's native shell for Xmake. Git Bash sets MSYSTEM on + # Windows, which makes host tools such as jom resolve for msys. - name: Read native dependency configuration id: dependency-config - shell: bash - run: xmake lua .github/scripts/cli-dependency-cache.lua "${{ matrix.plat }}" "${{ matrix.arch }}" "$RUNNER_TEMP/crossdesk-cli-config.lua" + run: xmake lua .github/scripts/cli-dependency-cache.lua "${{ matrix.plat }}" "${{ matrix.arch }}" "${{ runner.temp }}/crossdesk-cli-config.lua" - name: Set native dependency cache key id: dependency-key shell: bash @@ -118,8 +119,7 @@ jobs: key: ${{ steps.dependency-key.outputs.key }} restore-keys: ${{ steps.dependency-key.outputs.prefix }} - name: Configure native dependencies - shell: bash - run: xmake f -y --import="$RUNNER_TEMP/crossdesk-cli-config.lua" + run: xmake f -y --import="${{ runner.temp }}/crossdesk-cli-config.lua" # xmake f installs required packages. Save before compiling or packaging the CLI, # so failures in those later steps do not discard successfully installed dependencies. - name: Save native dependencies