From 9e8b2ee6e7a805885625f438a0c81a1561afaf7a Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Sat, 23 Dec 2023 22:31:24 +0100 Subject: [PATCH] Reworked CI versions - bumped building on Node 16 to Node 18 - removed all matrix executions apart from Node 18 --- .github/workflows/ci.yml | 24 ++++++++---------------- tools/BinaryBuilder.Dockerfile | 2 +- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24023d1f9..5db7026ae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,22 +27,14 @@ jobs: target: - x64 node: - - 10 - - 11 - - 12 - - 13 - - 14 - - 15 - - 16 - - 17 - 18 include: - os: windows-latest - node: 16 + node: 18 host: x86 target: x86 - os: macos-m1 - node: 16 + node: 18 host: arm64 target: arm64 name: ${{ matrix.os }} (node=${{ matrix.node }}, host=${{ matrix.host }}, target=${{ matrix.target }}) @@ -113,7 +105,7 @@ jobs: - name: Upload binaries to commit artifacts uses: actions/upload-artifact@v3 - if: matrix.node == 16 + if: matrix.node == 18 with: name: prebuilt-binaries path: build/stage/*/* @@ -121,7 +113,7 @@ jobs: - name: Upload binaries to GitHub Release run: yarn node-pre-gyp-github publish - if: matrix.node == 16 && startsWith(github.ref, 'refs/tags/') + if: matrix.node == 18 && startsWith(github.ref, 'refs/tags/') env: NODE_PRE_GYP_GITHUB_TOKEN: ${{ github.token }} build-qemu: @@ -131,7 +123,7 @@ jobs: fail-fast: false matrix: node: - - 16 + - 18 target: - linux/arm64 variant: @@ -141,7 +133,7 @@ jobs: # musl x64 builds - target: linux/amd64 variant: alpine3.15 - node: 16 + node: 18 name: ${{ matrix.variant }} (node=${{ matrix.node }}, target=${{ matrix.target }}) steps: - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 @@ -168,7 +160,7 @@ jobs: - name: Upload binaries to commit artifacts uses: actions/upload-artifact@v3 - if: matrix.node == 16 + if: matrix.node == 18 with: name: prebuilt-binaries path: build/stage/*/* @@ -176,6 +168,6 @@ jobs: - name: Upload binaries to GitHub Release run: yarn install --ignore-scripts && yarn node-pre-gyp-github publish - if: matrix.node == 16 && startsWith(github.ref, 'refs/tags/') + if: matrix.node == 18 && startsWith(github.ref, 'refs/tags/') env: NODE_PRE_GYP_GITHUB_TOKEN: ${{ github.token }} diff --git a/tools/BinaryBuilder.Dockerfile b/tools/BinaryBuilder.Dockerfile index 4760dabca..457c60845 100644 --- a/tools/BinaryBuilder.Dockerfile +++ b/tools/BinaryBuilder.Dockerfile @@ -1,4 +1,4 @@ -ARG NODE_VERSION=16 +ARG NODE_VERSION=18 ARG VARIANT=bullseye FROM node:$NODE_VERSION-$VARIANT