Skip to content

Commit c3cb047

Browse files
committed
ci: use setup-cpp + update the ci versions
1 parent be09ce2 commit c3cb047

File tree

1 file changed

+23
-20
lines changed

1 file changed

+23
-20
lines changed

.github/workflows/CI.yml

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
os:
1616
- ubuntu-20.04
17-
- macos-10.15
17+
- macos-11
1818
- windows-2019
1919
node_version:
2020
- 14
@@ -30,29 +30,29 @@ jobs:
3030
- true
3131

3232
# include:
33-
# - os: windows-latest
34-
# node_version: 14
35-
# node_arch: x86
36-
# zmq_draft: false
37-
# zmq_shared: false
38-
# skip_gc_finalizer_tests: true
33+
# - os: windows-latest
34+
# node_version: 14
35+
# node_arch: x86
36+
# zmq_draft: false
37+
# zmq_shared: false
38+
# skip_gc_finalizer_tests: true
3939

40-
# - os: macos-11.0
41-
# node_version: 15
42-
# node_arch: arm64
43-
# zmq_draft: false
44-
# zmq_shared: false
40+
# - os: macos-11.0
41+
# node_version: 15
42+
# node_arch: arm64
43+
# zmq_draft: false
44+
# zmq_shared: false
4545

4646
env:
4747
ZMQ_VERSION: ${{ matrix.zmq_version }}
4848
ZMQ_DRAFT: ${{ matrix.zmq_draft }}
4949
ZMQ_SHARED: ${{ matrix.zmq_shared }}
5050
SKIP_GC_FINALIZER_TESTS: ${{ matrix.skip_gc_finalizer_tests }}
5151
steps:
52-
- uses: actions/checkout@v2
52+
- uses: actions/checkout@v3
5353

5454
- name: Cache
55-
uses: actions/cache@v2
55+
uses: actions/cache@v3
5656
with:
5757
path: |
5858
./node_modules/
@@ -66,8 +66,16 @@ jobs:
6666
restore-keys: |
6767
"cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch }}-ZMQ_DRAFT:${{ matrix.zmq_draft }}-ZMQ_VERSION:${{ matrix.zmq_version }}-Node:${{ matrix.node_version }}"
6868
69+
- name: Setup Cpp
70+
uses: aminya/setup-cpp@v1
71+
with:
72+
vcvarsall: ${{ contains(matrix.os, 'windows') }}
73+
cmake: true
74+
ninja: true
75+
architecture: ${{ matrix.node_arch }}
76+
6977
- name: Install Node
70-
uses: actions/setup-node@v2
78+
uses: actions/setup-node@v3
7179
with:
7280
node-version: ${{ matrix.node_version }}
7381
architecture: ${{ matrix.node_arch }}
@@ -77,11 +85,6 @@ jobs:
7785
run: |
7886
brew install libsodium
7987
80-
- uses: ilammy/msvc-dev-cmd@v1
81-
if: contains(matrix.os, 'windows')
82-
with:
83-
arch: ${{ matrix.node_arch }}
84-
8588
- name: Install Dependencies and Build
8689
run: npm install
8790

0 commit comments

Comments
 (0)