Skip to content

Commit d91f011

Browse files
mikecovleeclaude
andcommitted
fix: use csbuild/make.sh + MSYS2 for proper Windows support
- Switch from raw cmake to csbuild/make.sh (matches network/gmssl pattern) - Add MSYS2 setup step for MinGW-w64 toolchain on Windows - Use cygpath for CS_DEV_PATH conversion on Windows - Keep curl+7z download step (works on all platforms under Git Bash) Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 035f6f9 commit d91f011

1 file changed

Lines changed: 23 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,32 @@ jobs:
4949
CS_HOME="${{ github.workspace }}/covscript-home"
5050
CS_HOME="${CS_HOME//\\//}"
5151
echo "cs_home=${CS_HOME}" >> "$GITHUB_OUTPUT"
52-
echo "=== SDK contents ==="
53-
ls -la covscript-home/
5452
55-
- name: Configure
53+
- name: Setup MSYS2 (Windows)
54+
if: runner.os == 'Windows'
55+
id: msys2
56+
uses: msys2/setup-msys2@v2
57+
with:
58+
msystem: UCRT64
59+
update: true
60+
install: >-
61+
mingw-w64-ucrt-x86_64-toolchain
62+
mingw-w64-ucrt-x86_64-cmake
63+
mingw-w64-ucrt-x86_64-make
64+
65+
- name: Build (Linux / macOS)
66+
if: runner.os != 'Windows'
5667
shell: bash
5768
env:
5869
CS_DEV_PATH: ${{ steps.sdk.outputs.cs_home }}/
59-
run: cmake -S . -B cmake-build
70+
run: bash csbuild/make.sh
6071

61-
- name: Build
72+
- name: Build (Windows)
73+
if: runner.os == 'Windows'
6274
shell: bash
63-
run: cmake --build cmake-build
75+
env:
76+
MSYS2_LOCATION: ${{ steps.msys2.outputs.msys2-location }}
77+
run: |
78+
export PATH="${{ steps.msys2.outputs.msys2-location }}/ucrt64/bin:${PATH}"
79+
export CS_DEV_PATH="$(cygpath -u "${{ steps.sdk.outputs.cs_home }}")/"
80+
bash csbuild/make.sh

0 commit comments

Comments
 (0)