Skip to content

Commit

Permalink
chore: add Windows with VS 2022 and Node.JS 19.x to the CI matrix (#1252
Browse files Browse the repository at this point in the history
)

* 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
  • Loading branch information
vmoroz authored Dec 19, 2022
1 parent 97736c9 commit 5c39373
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 16 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/ci-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,13 @@ jobs:
timeout-minutes: 30
strategy:
matrix:
node-version: [14.x, 16.x, 18.x]
node-version: [ 14.x, 16.x, 18.x, 19.x ]
os:
- windows-2019
- windows-2022
exclude:
- node-version: 14.x
os: windows-2022 # Node.JS 14.x GYP does not support Visual Studio 2022
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
Expand Down
28 changes: 13 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,19 @@ jobs:
timeout-minutes: 30
strategy:
matrix:
node-version: [14.x, 16.x, 18.x]
compiler:
- gcc
- clang
node-version: [ 14.x, 16.x, 18.x, 19.x ]
os:
- ubuntu-latest
- macos-latest
- ubuntu-latest
compiler:
- clang
- gcc
exclude:
- os: macos-latest
compiler: gcc # GCC is an alias for clang on the MacOS image.
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- name: Install system dependencies
run: |
if [ "${{ matrix.compiler }}" = "gcc" -a "${{ matrix.os }}" = ubuntu-* ]; then
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update
sudo apt-get install g++-6.5
fi
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
Expand All @@ -40,12 +36,14 @@ jobs:
if [ "${{ matrix.compiler }}" = "gcc" ]; then
export CC="gcc" CXX="g++"
fi
if [ "${{ matrix.compiler }}" = "gcc" -a "${{ matrix.os }}" = ubuntu-* ]; then
export CC="gcc-6.5" CXX="g++-6.5" AR="gcc-ar-6.5" RANLIB="gcc-ranlib-6.5" NM="gcc-nm-6.5"
fi
if [ "${{ matrix.compiler }}" = "clang" ]; then
export CC="clang" CXX="clang++"
fi
echo "CC=\"$CC\" CXX=\"$CXX\""
echo "$CC --version"
$CC --version
echo "$CXX --version"
$CXX --version
export CFLAGS="$CFLAGS -O3 --coverage" LDFLAGS="$LDFLAGS --coverage"
echo "CFLAGS=\"$CFLAGS\" LDFLAGS=\"$LDFLAGS\""
npm run pretest -- --verbose
Expand Down

0 comments on commit 5c39373

Please sign in to comment.