Patch merged PR #652 (#903)

* Fixed errors that were created  when a three year old pull request (#652) was rebased over multiple configuration changes.

* Run s3-bucket tests on pull requests

* Stop testing on Node.js v18 which is EOL next week

* Stop testing on Node.js v18 which is EOL next week

---------

Co-authored-by: Christian Clauss <cclauss@me.com>

Author: ronilan

.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:

.github/workflows/s3-bucket.yml

@@ -1,7 +1,10 @@
 name: S3 Bucket Test
 
 on:
+  pull_request:
   push:
+    branches:
+      - master
   workflow_dispatch:
 
 jobs:
@@ -10,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 }}

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) => {

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() {