From 2a707235a1bc836f2d901ddcd9d6721b5e65c0c1 Mon Sep 17 00:00:00 2001 From: Francis Gulotta Date: Sun, 10 May 2020 00:21:41 -0400 Subject: [PATCH] chore: build on node 14 and drop 32bit linux builds Build binaries on node 14 and test on node 14 Node 14 is no longer being built for 32bit linux, not much I can do. --- .github/workflows/lint.yml | 4 ++-- .github/workflows/test-merge.yml | 2 +- .github/workflows/test.yml | 2 +- .travis.yml | 7 +------ appveyor.yml | 2 +- packages/bindings/lib/mocks/linux-list.js | 2 +- 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 026cef5233..89114c4f98 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,10 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - name: Use Node.js 12 + - name: Use Node.js 14 uses: actions/setup-node@v1 with: - node-version: 12 + node-version: 14 - name: upgrade npm run: npm install -g npm - name: npm install diff --git a/.github/workflows/test-merge.yml b/.github/workflows/test-merge.yml index b034fadac2..510a653ec0 100644 --- a/.github/workflows/test-merge.yml +++ b/.github/workflows/test-merge.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: # chances are that we'll never break on a merge to master on just one version of node - node-version: [12.x] + node-version: [14.x] os: [ubuntu-latest, windows-latest, macos-latest] steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index beeb75a6cb..182a7bcbb7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - node-version: [8.x, 10.x, 12.x] + node-version: [8.x, 10.x, 12.x, 14.x] os: [ubuntu-latest, windows-latest, macos-latest] steps: - uses: actions/checkout@v1 diff --git a/.travis.yml b/.travis.yml index 7637bdabed..bf5e09e309 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,12 +19,7 @@ env: global: - secure: "L+AGMJc5NAsuym+xzB4FWj0c2rCobosixkoxLBhDBVkLiYsMtfS9y1w8Xz0pbWKJnJAH9tfwHluu5aX2qYk2HbreSyNzy8hbPW+9RbSyAQexeiZG4mLuDEz0xvlpCCQBsS1OfMypQk0/JvL4oA9B/xasrpkeVuPI7dwAz2WcFms=" matrix: - - BINARY_BUILDER="true" TRAVIS_NODE_VERSION="8" - - BINARY_BUILDER="true" TRAVIS_NODE_VERSION="8" ARCH="x86" -matrix: - exclude: - - os: osx - env: BINARY_BUILDER="true" TRAVIS_NODE_VERSION="8" ARCH="x86" + - BINARY_BUILDER="true" TRAVIS_NODE_VERSION="14" before_install: diff --git a/appveyor.yml b/appveyor.yml index adac5d3510..5526a86795 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ environment: secure: iDcAJCYgJK4tffyzEHbMVR8DatJcIN8eY0h29p9JQkl43TcEcm6Z6JLOBpGDk1MJ matrix: - - nodejs_version: "8" + - nodejs_version: "14" binary_builder: "true" platform: diff --git a/packages/bindings/lib/mocks/linux-list.js b/packages/bindings/lib/mocks/linux-list.js index 80dbea4fd0..f190b62fd2 100644 --- a/packages/bindings/lib/mocks/linux-list.js +++ b/packages/bindings/lib/mocks/linux-list.js @@ -30,7 +30,7 @@ listLinux.emit = () => { } listLinux.reset = () => { - mockPorts = {} + mockPorts = undefined } module.exports = listLinux