Skip to content

Commit 44e77bc

Browse files
authored
Update ci.yml
1 parent 5857bbb commit 44e77bc

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

.github/workflows/ci.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ jobs:
302302
./emsdk install ${{ matrix.emsdk_ver }}
303303
304304
- name: Setup default Build Type on *nux
305-
if: ${{ runner.os != 'windows' && steps.cachenotemscripten.outputs.cache-hit != 'true' }}
305+
if: ${{ runner.os != 'windows' && steps.cachenotemscripten.outputs.cache-hit != 'true' && matrix.emscripten != 'On' }}
306306
run: |
307307
echo "BUILD_TYPE=Release" >> $GITHUB_ENV
308308
echo "CODE_COVERAGE=0" >> $GITHUB_ENV
@@ -314,7 +314,7 @@ jobs:
314314
fi
315315
316316
- name: Setup default Build Type on *nux
317-
if: ${{ runner.os != 'windows' && steps.cacheemscripten.outputs.cache-hit != 'true' }}
317+
if: ${{ runner.os != 'windows' && steps.cacheemscripten.outputs.cache-hit != 'true' && matrix.emscripten != 'On' }}
318318
run: |
319319
echo "BUILD_TYPE=Release" >> $GITHUB_ENV
320320
echo "CODE_COVERAGE=0" >> $GITHUB_ENV
@@ -334,7 +334,7 @@ jobs:
334334
echo "ncpus=$env:ncpus" >> $env:GITHUB_ENV
335335
336336
- name: Setup compiler on Linux
337-
if: ${{ runner.os == 'Linux' && steps.cachenotemscripten.outputs.cache-hit != 'true' }}
337+
if: ${{ runner.os == 'Linux' && steps.cachenotemscripten.outputs.cache-hit != 'true' && matrix.emscripten != 'On' }}
338338
run: |
339339
# https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html
340340
vers="${compiler#*-}"
@@ -358,7 +358,7 @@ jobs:
358358
compiler: ${{ matrix.compiler }}
359359

360360
- name: Setup compiler on Linux
361-
if: ${{ runner.os == 'Linux' && steps.cacheemscripten.outputs.cache-hit != 'true' }}
361+
if: ${{ runner.os == 'Linux' && steps.cacheemscripten.outputs.cache-hit != 'true' && matrix.emscripten != 'On' }}
362362
run: |
363363
# https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html
364364
vers="${compiler#*-}"
@@ -382,7 +382,7 @@ jobs:
382382
compiler: ${{ matrix.compiler }}
383383

384384
- name: Setup compiler on macOS
385-
if: ${{ runner.os == 'macOS' && steps.cachenotemscripten.outputs.cache-hit != 'true' }}
385+
if: ${{ runner.os == 'macOS' && steps.cachenotemscripten.outputs.cache-hit != 'true' && matrix.emscripten != 'On' }}
386386
run: |
387387
vers="${compiler#*-}"
388388
if [[ "${{ matrix.compiler }}" == *"gcc"* ]]; then
@@ -419,7 +419,7 @@ jobs:
419419
compiler: ${{ matrix.compiler }}
420420

421421
- name: Setup compiler on macOS
422-
if: ${{ runner.os == 'macOS' && steps.cacheemscripten.outputs.cache-hit != 'true' }}
422+
if: ${{ runner.os == 'macOS' && steps.cacheemscripten.outputs.cache-hit != 'true' && matrix.emscripten == 'On' }}
423423
run: |
424424
vers="${compiler#*-}"
425425
if [[ "${{ matrix.compiler }}" == *"gcc"* ]]; then
@@ -487,7 +487,7 @@ jobs:
487487
$env:PATH="C:\Program Files (x86)\GnuWin32\bin;$env:PATH"
488488
489489
- name: Install deps on Linux
490-
if: ${{ runner.os == 'Linux' && steps.cachenotemscripten.outputs.cache-hit != 'true' }}
490+
if: ${{ runner.os == 'Linux' && steps.cachenotemscripten.outputs.cache-hit != 'true' && matrix.emscripten != 'On' }}
491491
run: |
492492
# Install deps
493493
sudo apt-get update
@@ -496,7 +496,7 @@ jobs:
496496
sudo apt-get clean
497497
498498
- name: Install deps on MacOS
499-
if: ${{ runner.os == 'macOS' && steps.cachenotemscripten.outputs.cache-hit != 'true' }}
499+
if: ${{ runner.os == 'macOS' && steps.cachenotemscripten.outputs.cache-hit != 'true' && matrix.emscripten != 'On' }}
500500
run: |
501501
brew update
502502
export ARCHITECHURE=$(uname -m)
@@ -514,7 +514,7 @@ jobs:
514514
brew upgrade
515515
516516
- name: Install deps on Linux
517-
if: ${{ runner.os == 'Linux' && steps.cacheemscripten.outputs.cache-hit != 'true' }}
517+
if: ${{ runner.os == 'Linux' && steps.cacheemscripten.outputs.cache-hit != 'true' && matrix.emscripten == 'On' }}
518518
run: |
519519
# Install deps
520520
sudo apt-get update
@@ -523,7 +523,7 @@ jobs:
523523
sudo apt-get clean
524524
525525
- name: Install deps on MacOS
526-
if: ${{ runner.os == 'macOS' && steps.cacheemscripten.outputs.cache-hit != 'true' }}
526+
if: ${{ runner.os == 'macOS' && steps.cacheemscripten.outputs.cache-hit != 'true' && matrix.emscripten == 'On' }}
527527
run: |
528528
brew update
529529
export ARCHITECHURE=$(uname -m)

0 commit comments

Comments
 (0)