Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Commit 81c5ae6

Browse files
authored
Update nodejs.yml
1 parent 2db0f18 commit 81c5ae6

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

.github/workflows/nodejs.yml

+16-9
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,31 @@ jobs:
99
matrix:
1010
node-version: [8.x, 10.x, 12.x]
1111
platform:
12-
- { os: windows-latest, hunspell: true }
12+
- { os: windows-latest, force-hunspell: true }
1313
- { os: windows-latest }
14-
- { os: macos-latest, hunspell: true }
14+
- { os: macos-latest, force-hunspell: true }
1515
- { os: macos-latest }
1616
- { os: ubuntu-latest }
17-
- { os: ubuntu-latest, c-compiler: clang, cpp-compiler: clang++ }
17+
- { os: ubuntu-latest, use-clang: true }
1818

1919
runs-on: ${{ matrix.platform.os }}
2020
env:
2121
SPELLCHECKER_PREFER_HUNSPELL: ${{ matrix.platform.hunspell }}
22-
CC: ${{ matrix.platform.c-compiler }}
23-
CXX: ${{ matrix.platform.cpp-compiler }}
2422

2523
steps:
2624
- uses: actions/checkout@v1
2725
- name: Use Node.js ${{ matrix.node-version }}
2826
uses: actions/setup-node@v1
2927
with:
3028
node-version: ${{ matrix.node-version }}
29+
- name: Clang env
30+
if: matrix.platform.use-clang == true
31+
run: |
32+
export CC="$(which clang)"
33+
export CPP="$(which clang++)"
3134
- name: npm install, build, and test
3235
run: |
36+
echo "Using $CC"
3337
npm install
3438
npm test
3539
@@ -43,12 +47,9 @@ jobs:
4347
- { os: windows-latest }
4448
- { os: macos-latest }
4549
- { os: ubuntu-latest }
46-
- { os: ubuntu-latest, c-compiler: clang, cpp-compiler: clang++ }
50+
- { os: ubuntu-latest, use-clang: true }
4751

4852
runs-on: ${{ matrix.platform.os }}
49-
env:
50-
CC: ${{ matrix.platform.c-compiler }}
51-
CXX: ${{ matrix.platform.cpp-compiler }}
5253

5354
steps:
5455
- uses: actions/checkout@v1
@@ -60,8 +61,14 @@ jobs:
6061
uses: actions/setup-python@v1
6162
with:
6263
python-version: ${{ matrix.python-version }}
64+
- name: Clang env
65+
if: matrix.platform.use-clang == true
66+
run: |
67+
export CC="$(which clang)"
68+
export CPP="$(which clang++)"
6369
- name: node-gyp install
6470
run: |
71+
echo "Using $CC"
6572
npm install -g node-gyp
6673
- name: node-gyp configure & build
6774
run: |

0 commit comments

Comments
 (0)