Skip to content

Commit 2f99b64

Browse files
vgvassilevvgvassilev
authored
[ci] Shorten matrix names. NFC (#923)
[ci] Shorten CI names and hoist matrix defaults. Check names like "Native Builds / ubu24-x86-gcc12-clang-repl-21-cppyy" wrap on phones and bury the meaningful tokens in boilerplate, and the matrix rows carry identical scaffolding that crowds out the fields that actually distinguish one row from the next. Renames: - workflow: "Native Builds" -> "CI", "Emscripten" -> "WASM" - native: drop "-clang-repl-" infix, spell runtime as "llvm<N>", "-vg" suffix for Valgrind jobs, "out-of-process" -> "oop" - wasm: "<os>-<arch>-emscr-llvm<rt>" Build_and_Test_CppInterOp previously detected wasm jobs via endsWith(matrix.name, '-emscripten'); switch the six call sites to an explicit matrix.wasm flag set on every wasm entry. Native-side default hoisting: - llvm_enable_projects, llvm_targets_to_build, and python-version move to `${{ matrix.X || 'default' }}` fallbacks in Build_LLVM and the setup-python step. - cling-version moves to a job-level env and is read via a matrix->env fallback in Build_LLVM and in Save_PR_Info's CLING_HASH computation (git ls-remote against the tag). The latter feeds the cache key; missing the fallback makes CLING_HASH expand to the empty string on cling rows and shifts the key, busting every cling cache. - root-llvm-tag stays on each cling row because the cache key reads matrix.root-llvm-tag literally, but its literal is pinned once via a YAML anchor (&root_llvm_tag) on the first cling row and referenced via *root_llvm_tag on the other three. - Simple rows collapse to flow-style one-liners. Wasm-side default hoisting (emscripten.yml, deploy-pages.yml): - LLVM_ENABLE_PROJECTS, LLVM_TARGETS_TO_BUILD, EMSDK_VER, and BUILD_STATIC_LIBRARY move to workflow-level env. The four inline cmake blocks and the emsdk activate/install lines read env.* directly; deploy-pages sets its own BUILD_STATIC_LIBRARY value ('Off'). - Build_and_Test_CppInterOp migrates matrix.emsdk_ver and matrix.build_static_library to env.*, keeping the action in sync with both workflow callers. - clang-runtime stays on each wasm row (cache key reads matrix.clang-runtime) but the literal is pinned via a YAML anchor (&clang_rt) on the first wasm row and referenced via *clang_rt on the other three. - micromamba_shell_init is derived inline from runner.os instead of being a per-row matrix field. - Wasm rows collapse to flow-style one-liners. Build_and_Test_cppyy used to gate its numba install with matrix.python-version != "3.14", which worked only because every cppyy row literally set python-version: '3.14'. Dropping the field (now supplied by the workflow default) made the substitution expand to the empty string and the gate misfired, tripping the numba build on Python 3.14 where it is unsupported. Replace the matrix-field check with a runtime python -c 'sys.version_info' read so the gate tracks the interpreter actually in use. Cache keys, expanded cmake args, and python versions are unchanged.
1 parent d89d71e commit 2f99b64

7 files changed

Lines changed: 105 additions & 218 deletions

File tree

‎.github/actions/Build_LLVM/action.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ runs:
1313
run: |
1414
cling_on=$(echo "${{ matrix.cling }}" | tr '[:lower:]' '[:upper:]')
1515
if [[ "${cling_on}" == "ON" ]]; then
16-
git clone --depth=1 --branch v${{ matrix.cling-version }} https://github.com/root-project/cling.git
16+
git clone --depth=1 --branch v${{ matrix.cling-version || env.CLING_VERSION }} https://github.com/root-project/cling.git
1717
git clone --depth=1 -b ${{ matrix.root-llvm-tag }} https://github.com/root-project/llvm-project.git
1818
else # repl
1919
git clone --depth=1 -b release/${{ matrix.clang-runtime }}.x https://github.com/llvm/llvm-project.git
@@ -23,10 +23,10 @@ runs:
2323
mkdir build
2424
if [[ "${cling_on}" == "ON" ]]; then
2525
cd build
26-
cmake -DLLVM_ENABLE_PROJECTS="${{ matrix.llvm_enable_projects }}" \
26+
cmake -DLLVM_ENABLE_PROJECTS="${{ matrix.llvm_enable_projects || 'clang' }}" \
2727
-DLLVM_EXTERNAL_PROJECTS=cling \
2828
-DLLVM_EXTERNAL_CLING_SOURCE_DIR=../../cling \
29-
-DLLVM_TARGETS_TO_BUILD="${{ matrix.llvm_targets_to_build }}" \
29+
-DLLVM_TARGETS_TO_BUILD="${{ matrix.llvm_targets_to_build || 'host;NVPTX' }}" \
3030
-DCMAKE_BUILD_TYPE=Release \
3131
-DLLVM_ENABLE_ASSERTIONS=ON \
3232
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
@@ -44,8 +44,8 @@ runs:
4444
echo "Apply clang20-1-out-of-process.patch:"
4545
fi
4646
cd build
47-
cmake -DLLVM_ENABLE_PROJECTS="${{ matrix.llvm_enable_projects}}" \
48-
-DLLVM_TARGETS_TO_BUILD="${{ matrix.llvm_targets_to_build }}" \
47+
cmake -DLLVM_ENABLE_PROJECTS="${{ matrix.llvm_enable_projects || 'clang' }}" \
48+
-DLLVM_TARGETS_TO_BUILD="${{ matrix.llvm_targets_to_build || 'host;NVPTX' }}" \
4949
-DCMAKE_BUILD_TYPE=Release \
5050
-DLLVM_ENABLE_ASSERTIONS=ON \
5151
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
@@ -97,7 +97,7 @@ runs:
9797
9898
if ( "${{ matrix.cling }}" -imatch "On" )
9999
{
100-
git clone --depth=1 --branch v${{ matrix.cling-version }} https://github.com/root-project/cling.git
100+
git clone --depth=1 --branch v${{ matrix.cling-version || env.CLING_VERSION }} https://github.com/root-project/cling.git
101101
git clone --depth=1 -b ${{ matrix.root-llvm-tag }} https://github.com/root-project/llvm-project.git
102102
$env:PWD_DIR= $PWD.Path
103103
$env:CLING_DIR="$env:PWD_DIR\cling"
@@ -114,10 +114,10 @@ runs:
114114
if ( "${{ matrix.cling }}" -imatch "On" )
115115
{
116116
cd build
117-
cmake -DLLVM_ENABLE_PROJECTS="${{ matrix.llvm_enable_projects}}" `
117+
cmake -DLLVM_ENABLE_PROJECTS="${{ matrix.llvm_enable_projects || 'clang' }}" `
118118
-DLLVM_EXTERNAL_PROJECTS=cling `
119119
-DLLVM_EXTERNAL_CLING_SOURCE_DIR="$env:CLING_DIR" `
120-
-DLLVM_TARGETS_TO_BUILD="${{ matrix.llvm_targets_to_build }}" `
120+
-DLLVM_TARGETS_TO_BUILD="${{ matrix.llvm_targets_to_build || 'host;NVPTX' }}" `
121121
-DCMAKE_BUILD_TYPE=Release `
122122
-DLLVM_ENABLE_ASSERTIONS=ON `
123123
-DCLANG_ENABLE_STATIC_ANALYZER=OFF `
@@ -133,8 +133,8 @@ runs:
133133
{
134134
cd build
135135
echo "Apply clang${{ matrix.clang-runtime }}-*.patch patches:"
136-
cmake -DLLVM_ENABLE_PROJECTS="${{ matrix.llvm_enable_projects}}" `
137-
-DLLVM_TARGETS_TO_BUILD="${{ matrix.llvm_targets_to_build }}" `
136+
cmake -DLLVM_ENABLE_PROJECTS="${{ matrix.llvm_enable_projects || 'clang' }}" `
137+
-DLLVM_TARGETS_TO_BUILD="${{ matrix.llvm_targets_to_build || 'host;NVPTX' }}" `
138138
-DCMAKE_BUILD_TYPE=Release `
139139
-DLLVM_ENABLE_ASSERTIONS=ON `
140140
-DCLANG_ENABLE_STATIC_ANALYZER=OFF `

‎.github/actions/Build_and_Test_CppInterOp/action.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ runs:
55
using: composite
66
steps:
77
- name: Build and Test/Install CppInterOp (native shared library build)
8-
if: ${{ runner.os != 'Windows' && !endsWith(matrix.name, '-emscripten') }}
8+
if: ${{ runner.os != 'Windows' && matrix.wasm != true }}
99
shell: bash
1010
run: |
1111
if [[ "${{ runner.environment }}" == "self-hosted" ]]; then
@@ -86,7 +86,7 @@ runs:
8686
echo "CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH" >> $GITHUB_ENV
8787
8888
- name: Build and Test/Install CppInterOp on Windows systems (native static library build)
89-
if: ${{ runner.os == 'Windows' && !endsWith(matrix.name, '-emscripten') }}
89+
if: ${{ runner.os == 'Windows' && matrix.wasm != true }}
9090
shell: powershell
9191
run: |
9292
$env:PWD_DIR= $PWD.Path
@@ -154,11 +154,11 @@ runs:
154154
cmake --build . --config ${{ env.BUILD_TYPE }} --target check-cppinterop --parallel ${{ env.ncpus }}
155155
156156
- name: Emscripten build of CppInterOp on Unix systems (shared library)
157-
if: ${{ runner.os != 'Windows' && endsWith(matrix.name, '-emscripten') }}
157+
if: ${{ runner.os != 'Windows' && matrix.wasm == true }}
158158
shell: bash -l {0}
159159
run: |
160160
set -e
161-
./emsdk/emsdk activate ${{matrix.emsdk_ver}}
161+
./emsdk/emsdk activate ${{ env.EMSDK_VER }}
162162
source ./emsdk/emsdk_env.sh
163163
micromamba create -f environment-wasm.yml --platform=emscripten-wasm32 -c https://prefix.dev/emscripten-forge-4x -c https://prefix.dev/conda-forge
164164
export SYSROOT_PATH=$PWD/emsdk/upstream/emscripten/cache/sysroot
@@ -347,13 +347,13 @@ runs:
347347
echo "PREFIX=$PREFIX" >> $GITHUB_ENV
348348
349349
- name: Emscripten build of CppInterOp on Unix systems (static library)
350-
if: runner.os != 'Windows' && !(startsWith(matrix.os, 'ubuntu') && matrix.clang-runtime == '19' && endsWith(matrix.os, 'arm')) && endsWith(matrix.name, '-emscripten') && matrix.build_static_library == 'On'
350+
if: runner.os != 'Windows' && !(startsWith(matrix.os, 'ubuntu') && matrix.clang-runtime == '19' && endsWith(matrix.os, 'arm')) && matrix.wasm == true && env.BUILD_STATIC_LIBRARY == 'On'
351351
shell: bash -l {0}
352352
run: |
353353
# FIXME: Static library builds, but tests fail to build on Github runner for Ubuntu arm llvm 19 case
354354
# Disabled build for now
355355
set -e
356-
./emsdk/emsdk activate ${{matrix.emsdk_ver}}
356+
./emsdk/emsdk activate ${{ env.EMSDK_VER }}
357357
source ./emsdk/emsdk_env.sh
358358
359359
# Build CppInterOp next to cling and llvm-project.
@@ -436,11 +436,11 @@ runs:
436436
cd ../../..
437437
438438
- name: Emscripten build of CppInterOp on Windows systems (shared library)
439-
if: ${{ runner.os == 'Windows' && endsWith(matrix.name, '-emscripten') }}
439+
if: ${{ runner.os == 'Windows' && matrix.wasm == true }}
440440
shell: powershell
441441
run: |
442442
micromamba create -f environment-wasm.yml --platform=emscripten-wasm32 -c https://prefix.dev/emscripten-forge-4x -c https://prefix.dev/conda-forge
443-
.\emsdk\emsdk activate ${{matrix.emsdk_ver}}
443+
.\emsdk\emsdk activate ${{ env.EMSDK_VER }}
444444
.\emsdk\emsdk_env.ps1
445445
$env:PWD_DIR= $PWD.Path
446446
$env:SYSROOT_PATH="$env:EMSDK/upstream/emscripten/cache/sysroot"
@@ -574,10 +574,10 @@ runs:
574574
echo "PREFIX=$env:PREFIX" >> $GITHUB_ENV
575575
576576
- name: Emscripten build of CppInterOp on Windows systems (static library)
577-
if: ${{ runner.os == 'Windows' && endsWith(matrix.name, '-emscripten') && matrix.build_static_library == 'On' && matrix.build_static_library == 'On' }}
577+
if: ${{ runner.os == 'Windows' && matrix.wasm == true && env.BUILD_STATIC_LIBRARY == 'On' && env.BUILD_STATIC_LIBRARY == 'On' }}
578578
shell: powershell
579579
run: |
580-
.\emsdk\emsdk activate ${{matrix.emsdk_ver}}
580+
.\emsdk\emsdk activate ${{ env.EMSDK_VER }}
581581
.\emsdk\emsdk_env.ps1
582582
function Error-OnFailure {
583583
param (

‎.github/actions/Build_and_Test_cppyy/action.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,11 @@ runs:
7979
python -m pip install --upgrade pip
8080
python -m pip install pytest
8181
python -m pip install pytest-xdist
82-
if [[ "${{ matrix.python-version }}" != "3.14" ]]; then
82+
# Detect the interpreter actually in use rather than matrix.python-version:
83+
# the latter is empty when the row inherits the workflow default, and numba
84+
# 0.61.2 refuses to build on Python >= 3.14.
85+
py_ver=$(python -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')
86+
if [[ "$py_ver" != "3.14" ]]; then
8387
python -m uv pip install numba==0.61.2
8488
fi
8589
echo ::endgroup::

‎.github/actions/Miscellaneous/Save_PR_Info/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ runs:
1515
1616
cling_on=$(echo "${{ matrix.cling }}" | tr '[:lower:]' '[:upper:]')
1717
if [[ "$cling_on" == "ON" ]]; then
18-
export CLING_HASH=$(git ls-remote https://github.com/root-project/cling.git refs/tags/v${{ matrix.cling-version }} | tr '\t' '-')
18+
export CLING_HASH=$(git ls-remote https://github.com/root-project/cling.git refs/tags/v${{ matrix.cling-version || env.CLING_VERSION }} | tr '\t' '-')
1919
export LLVM_HASH=$(git ls-remote https://github.com/root-project/llvm-project.git cling-llvm${{ matrix.clang-runtime}} | tr '\t' '-')
2020
else
2121
export CLING_HASH="Repl"
@@ -38,7 +38,7 @@ runs:
3838
3939
if ( "${{ matrix.cling }}" -imatch "On" )
4040
{
41-
$env:CLING_HASH_TEMP = ( git ls-remote https://github.com/root-project/cling.git refs/tags/v${{ matrix.cling-version }} )
41+
$env:CLING_HASH_TEMP = ( git ls-remote https://github.com/root-project/cling.git refs/tags/v${{ matrix.cling-version || env.CLING_VERSION }} )
4242
$env:CLING_HASH = $env:CLING_HASH_TEMP -replace "\t","-"
4343
}
4444
else

‎.github/workflows/deploy-pages.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ permissions:
1313
pages: write
1414
id-token: write
1515

16+
env:
17+
EMSDK_VER: "4.0.9"
18+
BUILD_STATIC_LIBRARY: Off
19+
1620
jobs:
1721
build:
1822
runs-on: ${{ matrix.os }}
1923

2024
strategy:
2125
fail-fast: false
2226
matrix:
27+
# micromamba_shell_init is derived below from runner.os.
2328
include:
24-
- name: osx26-arm-clang-repl-21-emscripten
25-
os: macos-26
26-
clang-runtime: '21'
27-
micromamba_shell_init: bash
28-
emsdk_ver: "4.0.9"
29-
build_static_library: Off
29+
- { name: osx26-arm-emscr-llvm21, os: macos-26, clang-runtime: '21', wasm: true }
3030

3131
steps:
3232
- uses: actions/checkout@v6
@@ -46,14 +46,14 @@ jobs:
4646
uses: mamba-org/setup-micromamba@main
4747
with:
4848
init-shell: >-
49-
${{ matrix.micromamba_shell_init }}
49+
${{ runner.os == 'Windows' && 'powershell' || 'bash' }}
5050
5151
- name: Setup emsdk
5252
shell: bash -l {0}
5353
run: |
5454
git clone --depth=1 https://github.com/emscripten-core/emsdk.git
5555
cd emsdk
56-
./emsdk install ${{ matrix.emsdk_ver }}
56+
./emsdk install ${{ env.EMSDK_VER }}
5757
5858
- name: Restore cached LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} build
5959
uses: actions/cache/restore@v4
@@ -70,7 +70,7 @@ jobs:
7070
- name: Build xeus-cpp
7171
shell: bash -l {0}
7272
run: |
73-
./emsdk/emsdk activate ${{matrix.emsdk_ver}}
73+
./emsdk/emsdk activate ${{ env.EMSDK_VER }}
7474
source ./emsdk/emsdk_env.sh
7575
micromamba activate CppInterOp-wasm
7676
git clone --depth=1 https://github.com/compiler-research/xeus-cpp.git

‎.github/workflows/emscripten.yml‎

Lines changed: 30 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Emscripten
1+
name: WASM
22
on:
33
pull_request:
44
branches: [main]
@@ -13,47 +13,29 @@ concurrency:
1313
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}
1414
cancel-in-progress: true
1515

16+
env:
17+
# Uniform across every wasm row; referenced below via env.* instead of
18+
# being repeated on each matrix entry.
19+
LLVM_ENABLE_PROJECTS: "clang;lld"
20+
LLVM_TARGETS_TO_BUILD: "WebAssembly"
21+
EMSDK_VER: "4.0.9"
22+
BUILD_STATIC_LIBRARY: ${{ github.event_name == 'schedule' && 'On' || 'Off' }}
23+
1624
jobs:
1725
build:
1826
name: ${{ matrix.name }}
1927
runs-on: ${{ matrix.os }}
2028
strategy:
2129
fail-fast: false
2230
matrix:
31+
# clang-runtime is pinned once via a YAML anchor on the first row
32+
# (cache key reads matrix.clang-runtime, so the field must live on
33+
# each row). micromamba_shell_init is derived below from runner.os.
2334
include:
24-
- name: ubu24-arm-clang-repl-21-emscripten
25-
os: ubuntu-24.04-arm
26-
clang-runtime: '21'
27-
llvm_enable_projects: "clang;lld"
28-
llvm_targets_to_build: "WebAssembly"
29-
emsdk_ver: "4.0.9"
30-
build_static_library: ${{ github.event_name == 'schedule' && 'On' || 'Off' }}
31-
micromamba_shell_init: bash
32-
run-in-prs: true
33-
- name: osx26-arm-clang-repl-21-emscripten
34-
os: macos-26
35-
clang-runtime: '21'
36-
llvm_enable_projects: "clang;lld"
37-
llvm_targets_to_build: "WebAssembly"
38-
emsdk_ver: "4.0.9"
39-
build_static_library: ${{ github.event_name == 'schedule' && 'On' || 'Off' }}
40-
micromamba_shell_init: bash
41-
- name: ubu24-x86-clang-repl-21-emscripten
42-
os: ubuntu-24.04
43-
clang-runtime: '21'
44-
llvm_enable_projects: "clang;lld"
45-
llvm_targets_to_build: "WebAssembly"
46-
emsdk_ver: "4.0.9"
47-
build_static_library: ${{ github.event_name == 'schedule' && 'On' || 'Off' }}
48-
micromamba_shell_init: bash
49-
- name: win2025-x86-clang-repl-21-emscripten
50-
os: windows-2025
51-
clang-runtime: '21'
52-
llvm_enable_projects: "clang;lld"
53-
llvm_targets_to_build: "WebAssembly"
54-
emsdk_ver: "4.0.9"
55-
build_static_library: ${{ github.event_name == 'schedule' && 'On' || 'Off' }}
56-
micromamba_shell_init: powershell
35+
- { name: ubu24-arm-emscr-llvm21, os: ubuntu-24.04-arm, clang-runtime: &clang_rt '21', wasm: true, run-in-prs: true }
36+
- { name: osx26-arm-emscr-llvm21, os: macos-26, clang-runtime: *clang_rt, wasm: true }
37+
- { name: ubu24-x86-emscr-llvm21, os: ubuntu-24.04, clang-runtime: *clang_rt, wasm: true }
38+
- { name: win2025-x86-emscr-llvm21, os: windows-2025, clang-runtime: *clang_rt, wasm: true }
5739

5840
steps:
5941
- uses: actions/checkout@v6
@@ -84,7 +66,7 @@ jobs:
8466
run: |
8567
git clone --depth=1 https://github.com/emscripten-core/emsdk.git
8668
cd emsdk
87-
./emsdk install ${{ matrix.emsdk_ver }}
69+
./emsdk install ${{ env.EMSDK_VER }}
8870
8971
- name: Setup default Build Type
9072
if: ${{ !(github.event_name == 'pull_request' && matrix.run-in-prs != true) }}
@@ -124,7 +106,7 @@ jobs:
124106
- name: Build LLVM/Cling on Unix systems if the cache is invalid (emscripten)
125107
if: ${{ runner.os != 'windows' && steps.cache.outputs.cache-hit != 'true' && !(github.event_name == 'pull_request' && matrix.run-in-prs != true) }}
126108
run: |
127-
./emsdk/emsdk activate ${{matrix.emsdk_ver}}
109+
./emsdk/emsdk activate ${{ env.EMSDK_VER }}
128110
source ./emsdk/emsdk_env.sh
129111
cling_on=$(echo "${{ matrix.cling }}" | tr '[:lower:]' '[:upper:]')
130112
if [[ "${cling_on}" == "ON" ]]; then
@@ -152,9 +134,9 @@ jobs:
152134
-DLLVM_EXTERNAL_CLING_SOURCE_DIR=../../cling \
153135
-DCMAKE_BUILD_TYPE=Release \
154136
-DLLVM_HOST_TRIPLE=wasm32-unknown-emscripten \
155-
-DLLVM_TARGETS_TO_BUILD="${{ matrix.llvm_targets_to_build }}" \
137+
-DLLVM_TARGETS_TO_BUILD="${{ env.LLVM_TARGETS_TO_BUILD }}" \
156138
-DLLVM_ENABLE_LIBEDIT=OFF \
157-
-DLLVM_ENABLE_PROJECTS="${{ matrix.llvm_enable_projects }}" \
139+
-DLLVM_ENABLE_PROJECTS="${{ env.LLVM_ENABLE_PROJECTS }}" \
158140
-DLLVM_ENABLE_ZSTD=OFF \
159141
-DLLVM_ENABLE_LIBXML2=OFF \
160142
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
@@ -185,9 +167,9 @@ jobs:
185167
cd build
186168
emcmake cmake -DCMAKE_BUILD_TYPE=Release \
187169
-DLLVM_HOST_TRIPLE=wasm32-unknown-emscripten \
188-
-DLLVM_TARGETS_TO_BUILD="${{ matrix.llvm_targets_to_build }}" \
170+
-DLLVM_TARGETS_TO_BUILD="${{ env.LLVM_TARGETS_TO_BUILD }}" \
189171
-DLLVM_ENABLE_LIBEDIT=OFF \
190-
-DLLVM_ENABLE_PROJECTS="${{ matrix.llvm_enable_projects }}" \
172+
-DLLVM_ENABLE_PROJECTS="${{ env.LLVM_ENABLE_PROJECTS }}" \
191173
-DLLVM_ENABLE_ZSTD=OFF \
192174
-DLLVM_ENABLE_LIBXML2=OFF \
193175
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
@@ -229,7 +211,7 @@ jobs:
229211
- name: Build LLVM/Cling on Windows systems if the cache is invalid (emscripten)
230212
if: ${{ runner.os == 'windows' && steps.cache.outputs.cache-hit != 'true' && !(github.event_name == 'pull_request' && matrix.run-in-prs != true)}}
231213
run: |
232-
.\emsdk\emsdk activate ${{matrix.emsdk_ver}}
214+
.\emsdk\emsdk activate ${{ env.EMSDK_VER }}
233215
.\emsdk\emsdk_env.ps1
234216
if ( "${{ matrix.cling }}" -imatch "On" )
235217
{
@@ -265,9 +247,9 @@ jobs:
265247
-DLLVM_EXTERNAL_CLING_SOURCE_DIR=../../cling `
266248
-DCMAKE_BUILD_TYPE=Release `
267249
-DLLVM_HOST_TRIPLE=wasm32-unknown-emscripten `
268-
-DLLVM_TARGETS_TO_BUILD="${{ matrix.llvm_targets_to_build }}" `
250+
-DLLVM_TARGETS_TO_BUILD="${{ env.LLVM_TARGETS_TO_BUILD }}" `
269251
-DLLVM_ENABLE_LIBEDIT=OFF `
270-
-DLLVM_ENABLE_PROJECTS="${{ matrix.llvm_enable_projects }}" `
252+
-DLLVM_ENABLE_PROJECTS="${{ env.LLVM_ENABLE_PROJECTS }}" `
271253
-DLLVM_ENABLE_ZSTD=OFF `
272254
-DLLVM_ENABLE_LIBXML2=OFF `
273255
-DCLANG_ENABLE_STATIC_ANALYZER=OFF `
@@ -316,9 +298,9 @@ jobs:
316298
echo "Apply clang${{ matrix.clang-runtime }}-*.patch patches:"
317299
emcmake cmake -DCMAKE_BUILD_TYPE=Release `
318300
-DLLVM_HOST_TRIPLE=wasm32-unknown-emscripten `
319-
-DLLVM_TARGETS_TO_BUILD="${{ matrix.llvm_targets_to_build }}" `
301+
-DLLVM_TARGETS_TO_BUILD="${{ env.LLVM_TARGETS_TO_BUILD }}" `
320302
-DLLVM_ENABLE_LIBEDIT=OFF `
321-
-DLLVM_ENABLE_PROJECTS="${{ matrix.llvm_enable_projects }}" `
303+
-DLLVM_ENABLE_PROJECTS="${{ env.LLVM_ENABLE_PROJECTS }}" `
322304
-DLLVM_ENABLE_ZSTD=OFF `
323305
-DLLVM_ENABLE_LIBXML2=OFF `
324306
-DCLANG_ENABLE_STATIC_ANALYZER=OFF `
@@ -375,7 +357,7 @@ jobs:
375357
uses: mamba-org/setup-micromamba@main
376358
with:
377359
init-shell: >-
378-
${{ matrix.micromamba_shell_init }}
360+
${{ runner.os == 'Windows' && 'powershell' || 'bash' }}
379361
380362
- name: micromamba shell hook
381363
if: ${{ runner.os == 'Windows' && !(github.event_name == 'pull_request' && matrix.run-in-prs != true) }}
@@ -391,7 +373,7 @@ jobs:
391373
if: ${{ runner.os != 'windows' && !(github.event_name == 'pull_request' && matrix.run-in-prs != true) }}
392374
shell: bash -l {0}
393375
run: |
394-
./emsdk/emsdk activate ${{matrix.emsdk_ver}}
376+
./emsdk/emsdk activate ${{ env.EMSDK_VER }}
395377
source ./emsdk/emsdk_env.sh
396378
micromamba activate CppInterOp-wasm
397379
git clone --depth=1 https://github.com/compiler-research/xeus-cpp.git
@@ -415,7 +397,7 @@ jobs:
415397
if: ${{ runner.os == 'windows' && !(github.event_name == 'pull_request' && matrix.run-in-prs != true) }}
416398
shell: powershell
417399
run: |
418-
.\emsdk\emsdk activate ${{matrix.emsdk_ver}}
400+
.\emsdk\emsdk activate ${{ env.EMSDK_VER }}
419401
.\emsdk\emsdk_env.ps1
420402
micromamba activate CppInterOp-wasm
421403
git clone --depth=1 https://github.com/compiler-research/xeus-cpp.git

0 commit comments

Comments
 (0)