Skip to content

Commit 2ad4974

Browse files
committed
Fixing clang-cl CI run
1 parent 6298cd9 commit 2ad4974

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

.github/workflows/test.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
- 'LICENSE'
1313
- 'doc/**'
1414
- 'tools/**'
15+
workflow_dispatch:
1516

1617
jobs:
1718
define-matrix:
@@ -32,7 +33,8 @@ jobs:
3233
3334
macos_map = {
3435
'macos-14': "15.4",
35-
'macos-15': "16.2"
36+
'macos-15': "16.4",
37+
'macos-26': "26.2"
3638
}
3739
3840
win_paltforms = ["x64", "Win32"]
@@ -56,7 +58,8 @@ jobs:
5658
}
5759
emscripten_versions = [
5860
'3.1.74',
59-
'4.0.15',
61+
'4.0.22',
62+
'5.0.0'
6063
]
6164
6265
hosts = []
@@ -190,6 +193,12 @@ jobs:
190193
shell: bash
191194
run: |
192195
cmake $CMAKE_GENERATOR -S . -B out $CMAKE_ARGS -DCMAKE_BUILD_TYPE=MinSizeRel
196+
if [[ '${{ matrix.os }}' == windows-* ]]; then
197+
if [ -f out/test/pythonloc.txt ]; then
198+
pythloc=$(cat out/test/pythonloc.txt)
199+
echo "$pythloc" >> $GITHUB_PATH
200+
fi
201+
fi
193202
194203
- name: Build and Test
195204
shell: bash
@@ -350,15 +359,15 @@ jobs:
350359
fail-fast: false
351360
matrix:
352361
python-version: [
353-
"3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.13t",
362+
"3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.13t", "3.14",
354363
"pypy-3.9", "pypy-3.10", "pypy-3.11"
355364
]
356365
steps:
357366
- name: Checkout
358367
uses: actions/checkout@v4
359368

360369
- name: Set up Python
361-
uses: actions/setup-python@v5
370+
uses: actions/setup-python@v6
362371
id: setup-python
363372
with:
364373
python-version: ${{matrix.python-version}}

test/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,12 @@ endforeach()
315315
endforeach()
316316
endforeach()
317317

318+
if(${CMAKE_SYSTEM_NAME} STREQUAL Windows AND ${Python3_Development_FOUND} AND ${Python3_Interpreter_FOUND})
319+
file(GENERATE OUTPUT pythonloc.txt
320+
CONTENT ${Python3_RUNTIME_LIBRARY_DIRS}
321+
)
322+
endif()
323+
318324
add_custom_target(run-test
319325
DEPENDS ${TEST_DEPS}
320326
${TEST_COMMAND}

0 commit comments

Comments
 (0)