From d7d371745a05b710b2385ca3f4985501ab75eaa5 Mon Sep 17 00:00:00 2001 From: Ron Ilan Date: Fri, 25 Apr 2025 09:24:47 -0700 Subject: [PATCH 1/4] Fixed errors that were created when a three year old pull request (#652) was rebased over multiple configuration changes. --- lib/mock/http.js | 4 ++-- lib/mock/s3.js | 3 +-- package-lock.json | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/mock/http.js b/lib/mock/http.js index eb2fd09b7..b5625d8b3 100644 --- a/lib/mock/http.js +++ b/lib/mock/http.js @@ -7,8 +7,7 @@ const path = require('path'); const nock = require('nock'); const os = require('os'); -const log = require('npmlog'); -log.disableProgress(); // disable the display of a progress bar +const log = require('../util/log.js'); log.heading = 'node-pre-gyp'; // differentiate node-pre-gyp's logs from npm's function http_mock() { @@ -17,6 +16,7 @@ function http_mock() { const basePath = `${os.tmpdir()}/mock`; nock(new RegExp('([a-z0-9]+[.])*s3[.]us-east-1[.]amazonaws[.]com')) + .persist() .get(() => true) //a function that always returns true is a catch all for nock .reply( (uri) => { diff --git a/lib/mock/s3.js b/lib/mock/s3.js index 076b995be..e485e3bdb 100644 --- a/lib/mock/s3.js +++ b/lib/mock/s3.js @@ -5,8 +5,7 @@ module.exports = exports = s3_mock; const AWSMock = require('mock-aws-s3'); const os = require('os'); -const log = require('npmlog'); -log.disableProgress(); // disable the display of a progress bar +const log = require('../util/log.js'); log.heading = 'node-pre-gyp'; // differentiate node-pre-gyp's logs from npm's function s3_mock() { diff --git a/package-lock.json b/package-lock.json index 6515d46f2..43cf6bd86 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "node-addon-api": "^8.1.0", "nyc": "^17.0.0", "tape": "^5.5.2", - "tar-fs": "^3.0.6" + "tar-fs": "^3.0.8" }, "engines": { "node": ">=18" From cc915a4c3818cb39169580640f95dead62f551ac Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Fri, 25 Apr 2025 19:04:41 +0200 Subject: [PATCH 2/4] Run s3-bucket tests on pull requests --- .github/workflows/s3-bucket.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/s3-bucket.yml b/.github/workflows/s3-bucket.yml index 06df7c203..8b8080670 100644 --- a/.github/workflows/s3-bucket.yml +++ b/.github/workflows/s3-bucket.yml @@ -1,7 +1,10 @@ name: S3 Bucket Test on: + pull_request: push: + branches: + - master workflow_dispatch: jobs: From d2c9d0edd98b0ef4637adea625370e0c55920922 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Fri, 25 Apr 2025 19:10:30 +0200 Subject: [PATCH 3/4] Stop testing on Node.js v18 which is EOL next week --- .github/workflows/s3-bucket.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/s3-bucket.yml b/.github/workflows/s3-bucket.yml index 8b8080670..624f43b33 100644 --- a/.github/workflows/s3-bucket.yml +++ b/.github/workflows/s3-bucket.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - node: [18, 20, 22] + node: [20, 'lts/*'] env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} From 526892c6e2c86c583d0f21bf9da6bd9b19c61bff Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Fri, 25 Apr 2025 19:11:23 +0200 Subject: [PATCH 4/4] Stop testing on Node.js v18 which is EOL next week --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ffb3e6f3..bd67bcd10 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - node-version: ['18.x', '20.x', 'lts/*'] + node-version: ['20.x', 'lts/*'] os: [macos-latest, ubuntu-latest, ubuntu-24.04-arm, windows-latest] runs-on: ${{ matrix.os }} steps: