Skip to content

Commit 5c39373

Browse files
authored
chore: add Windows with VS 2022 and Node.JS 19.x to the CI matrix (#1252)
* chore: add Windows and VS 2022 to the CI matrix * apply windows-2022 only to node 18.x * add Node 19.x to the test matrix for Windows * add Node.JS 19.x to MacOS and Ubuntu runners * Fix variable name * remove unused code to setup gcc 6.5 * remove macos-latest + gcc from the matrix * try to fix the MacOS test matrix * try an alternative way to exclude macos-gcc * use alternative syntax to exclude Node 14.x/window-2022
1 parent 97736c9 commit 5c39373

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

.github/workflows/ci-win.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ jobs:
77
timeout-minutes: 30
88
strategy:
99
matrix:
10-
node-version: [14.x, 16.x, 18.x]
10+
node-version: [ 14.x, 16.x, 18.x, 19.x ]
1111
os:
1212
- windows-2019
13+
- windows-2022
14+
exclude:
15+
- node-version: 14.x
16+
os: windows-2022 # Node.JS 14.x GYP does not support Visual Studio 2022
1317
runs-on: ${{ matrix.os }}
1418
steps:
1519
- uses: actions/checkout@v3

.github/workflows/ci.yml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,19 @@ jobs:
77
timeout-minutes: 30
88
strategy:
99
matrix:
10-
node-version: [14.x, 16.x, 18.x]
11-
compiler:
12-
- gcc
13-
- clang
10+
node-version: [ 14.x, 16.x, 18.x, 19.x ]
1411
os:
15-
- ubuntu-latest
1612
- macos-latest
13+
- ubuntu-latest
14+
compiler:
15+
- clang
16+
- gcc
17+
exclude:
18+
- os: macos-latest
19+
compiler: gcc # GCC is an alias for clang on the MacOS image.
1720
runs-on: ${{ matrix.os }}
1821
steps:
1922
- uses: actions/checkout@v3
20-
- name: Install system dependencies
21-
run: |
22-
if [ "${{ matrix.compiler }}" = "gcc" -a "${{ matrix.os }}" = ubuntu-* ]; then
23-
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
24-
sudo apt-get update
25-
sudo apt-get install g++-6.5
26-
fi
2723
- name: Use Node.js ${{ matrix.node-version }}
2824
uses: actions/setup-node@v3
2925
with:
@@ -40,12 +36,14 @@ jobs:
4036
if [ "${{ matrix.compiler }}" = "gcc" ]; then
4137
export CC="gcc" CXX="g++"
4238
fi
43-
if [ "${{ matrix.compiler }}" = "gcc" -a "${{ matrix.os }}" = ubuntu-* ]; then
44-
export CC="gcc-6.5" CXX="g++-6.5" AR="gcc-ar-6.5" RANLIB="gcc-ranlib-6.5" NM="gcc-nm-6.5"
45-
fi
4639
if [ "${{ matrix.compiler }}" = "clang" ]; then
4740
export CC="clang" CXX="clang++"
4841
fi
42+
echo "CC=\"$CC\" CXX=\"$CXX\""
43+
echo "$CC --version"
44+
$CC --version
45+
echo "$CXX --version"
46+
$CXX --version
4947
export CFLAGS="$CFLAGS -O3 --coverage" LDFLAGS="$LDFLAGS --coverage"
5048
echo "CFLAGS=\"$CFLAGS\" LDFLAGS=\"$LDFLAGS\""
5149
npm run pretest -- --verbose

0 commit comments

Comments
 (0)