Skip to content

Commit 45f8993

Browse files
authored
Fix action
1 parent f31b6d0 commit 45f8993

File tree

1 file changed

+6
-6
lines changed
  • .github/actions/Build_and_Test_CppInterOp

1 file changed

+6
-6
lines changed

.github/actions/Build_and_Test_CppInterOp/action.yml

Lines changed: 6 additions & 6 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
8-
if: ${{ runner.os != 'Windows' && !endsWith(github.job, '-emscripten') }}
8+
if: ${{ runner.os != 'Windows' && !endsWith(matrix.name, '-emscripten') }}
99
shell: bash
1010
run: |
1111
LLVM_DIR="$(pwd)/llvm-project"
@@ -80,7 +80,7 @@ runs:
8080
echo "CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH" >> $GITHUB_ENV
8181
8282
- name: Build and Test/Install CppInterOp on Windows systems
83-
if: ${{ runner.os == 'Windows' && !endsWith(github.job, '-emscripten') }}
83+
if: ${{ runner.os == 'Windows' && !endsWith(matrix.name, '-emscripten') }}
8484
shell: powershell
8585
run: |
8686
$env:PWD_DIR= $PWD.Path
@@ -148,7 +148,7 @@ runs:
148148
cmake --build . --config ${{ env.BUILD_TYPE }} --target check-cppinterop --parallel ${{ env.ncpus }}
149149
150150
- name: Emscripten build of CppInterOp on Unix systems (shared library)
151-
if: ${{ runner.os != 'Windows' && endsWith(github.job, '-emscripten') }}
151+
if: ${{ runner.os != 'Windows' && endsWith(matrix.name, '-emscripten') }}
152152
shell: bash -l {0}
153153
run: |
154154
set -e
@@ -321,7 +321,7 @@ runs:
321321
echo "PREFIX=$PREFIX" >> $GITHUB_ENV
322322
323323
- name: Emscripten build of CppInterOp on Unix systems (static library)
324-
if: runner.os != 'Windows' && !(startsWith(matrix.os, 'ubuntu') && matrix.clang-runtime == '19' && endsWith(matrix.os, 'arm')) && endsWith(github.job, '-emscripten') && matrix.build_static_library == 'On'
324+
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'
325325
shell: bash -l {0}
326326
run: |
327327
# FIXME: Static library builds, but tests fail to build on Github runner for Ubuntu arm llvm 19 case
@@ -443,7 +443,7 @@ runs:
443443
echo "PREFIX=$PREFIX" >> $GITHUB_ENV
444444
445445
- name: Build and Test/Install CppInterOp on Windows systems (shared library)
446-
if: ${{ runner.os == 'Windows' && endsWith(github.job, '-emscripten') }}
446+
if: ${{ runner.os == 'Windows' && endsWith(matrix.name, '-emscripten') }}
447447
shell: powershell
448448
run: |
449449
micromamba create -f environment-wasm.yml --platform=emscripten-wasm32
@@ -567,7 +567,7 @@ runs:
567567
echo "PREFIX=$env:PREFIX" >> $GITHUB_ENV
568568
569569
- name: Build and Test/Install CppInterOp on Windows systems (static library)
570-
if: ${{ runner.os == 'Windows' && endsWith(github.job, '-emscripten') && matrix.build_static_library == 'On' && matrix.build_static_library == 'On' }}
570+
if: ${{ runner.os == 'Windows' && endsWith(matrix.name, '-emscripten') && matrix.build_static_library == 'On' && matrix.build_static_library == 'On' }}
571571
shell: powershell
572572
run: |
573573
.\emsdk\emsdk activate ${{matrix.emsdk_ver}}

0 commit comments

Comments
 (0)