ci: use setup-cpp + update the ci versions

zeromq · Sep 5, 2022 · c3cb047 · c3cb047
1 parent be09ce2
commit c3cb047
Showing 1 changed file with 23 additions and 20 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         os:
           - ubuntu-20.04
-          - macos-10.15
+          - macos-11
           - windows-2019
         node_version:
           - 14
@@ -30,29 +30,29 @@ jobs:
           - true
 
         # include:
-          # - os: windows-latest
-          #   node_version: 14
-          #   node_arch: x86
-          #   zmq_draft: false
-          #   zmq_shared: false
-          #   skip_gc_finalizer_tests: true
+        # - os: windows-latest
+        #   node_version: 14
+        #   node_arch: x86
+        #   zmq_draft: false
+        #   zmq_shared: false
+        #   skip_gc_finalizer_tests: true
 
-          # - os: macos-11.0
-          #   node_version: 15
-          #   node_arch: arm64
-          #   zmq_draft: false
-          #   zmq_shared: false
+        # - os: macos-11.0
+        #   node_version: 15
+        #   node_arch: arm64
+        #   zmq_draft: false
+        #   zmq_shared: false
 
     env:
       ZMQ_VERSION: ${{ matrix.zmq_version }}
       ZMQ_DRAFT: ${{ matrix.zmq_draft }}
       ZMQ_SHARED: ${{ matrix.zmq_shared }}
       SKIP_GC_FINALIZER_TESTS: ${{ matrix.skip_gc_finalizer_tests }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ./node_modules/
@@ -66,8 +66,16 @@ jobs:
           restore-keys: |
             "cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch }}-ZMQ_DRAFT:${{ matrix.zmq_draft }}-ZMQ_VERSION:${{ matrix.zmq_version }}-Node:${{ matrix.node_version }}"
 
+      - name: Setup Cpp
+        uses: aminya/setup-cpp@v1
+        with:
+          vcvarsall: ${{ contains(matrix.os, 'windows') }}
+          cmake: true
+          ninja: true
+          architecture: ${{ matrix.node_arch }}
+
       - name: Install Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node_version }}
           architecture: ${{ matrix.node_arch }}
@@ -77,11 +85,6 @@ jobs:
         run: |
           brew install libsodium
 
-      - uses: ilammy/msvc-dev-cmd@v1
-        if: contains(matrix.os, 'windows')
-        with:
-          arch: ${{ matrix.node_arch }}
-
       - name: Install Dependencies and Build
         run: npm install