Skip to content

Commit

Permalink
chore!: make node 14 the minimum version (#2230)
Browse files Browse the repository at this point in the history
* chore!: make node 14 the minimum version

* move conformance test to node 14

* package upgrades, fix unit test compilation

* update google owned deps

* fix tests

* remove node 12 kokoro folders
  • Loading branch information
ddelgrosso1 authored Jul 24, 2023
1 parent ee8354e commit a8ab62b
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 119 deletions.
2 changes: 1 addition & 1 deletion .github/sync-repo-settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ branchProtectionRules:
- "ci/kokoro: System test"
- docs
- lint
- test (12)
- test (14)
- test (16)
- test (18)
- cla/google
- windows
- OwlBot Post Processor
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: [12, 14, 16]
node: [14, 16, 18]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conformance-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 12
node-version: 14
- run: node --version
- run: npm install
- run: npm run conformance-test
24 changes: 0 additions & 24 deletions .kokoro/continuous/node12/common.cfg

This file was deleted.

4 changes: 0 additions & 4 deletions .kokoro/continuous/node12/lint.cfg

This file was deleted.

12 changes: 0 additions & 12 deletions .kokoro/continuous/node12/samples-test.cfg

This file was deleted.

12 changes: 0 additions & 12 deletions .kokoro/continuous/node12/system-test.cfg

This file was deleted.

Empty file removed .kokoro/continuous/node12/test.cfg
Empty file.
24 changes: 0 additions & 24 deletions .kokoro/presubmit/node12/common.cfg

This file was deleted.

4 changes: 0 additions & 4 deletions .kokoro/presubmit/node12/conformance-test.cfg

This file was deleted.

12 changes: 0 additions & 12 deletions .kokoro/presubmit/node12/samples-test.cfg

This file was deleted.

12 changes: 0 additions & 12 deletions .kokoro/presubmit/node12/system-test.cfg

This file was deleted.

Empty file removed .kokoro/presubmit/node12/test.cfg
Empty file.
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "Apache-2.0",
"author": "Google Inc.",
"engines": {
"node": ">=12"
"node": ">=14"
},
"repository": "googleapis/nodejs-storage",
"main": "./build/src/index.js",
Expand Down Expand Up @@ -58,13 +58,13 @@
"compressible": "^2.0.12",
"duplexify": "^4.0.0",
"ent": "^2.2.0",
"gaxios": "^5.1.2",
"google-auth-library": "^8.0.1",
"gaxios": "^6.0.2",
"google-auth-library": "^9.0.0",
"mime": "^3.0.0",
"mime-types": "^2.0.8",
"p-limit": "^3.0.1",
"retry-request": "^5.0.0",
"teeny-request": "^8.0.0",
"retry-request": "^6.0.0",
"teeny-request": "^9.0.0",
"uuid": "^8.0.0"
},
"devDependencies": {
Expand All @@ -78,17 +78,17 @@
"@types/mime-types": "^2.1.0",
"@types/mocha": "^9.1.1",
"@types/mockery": "^1.4.29",
"@types/node": "^18.0.0",
"@types/node": "^20.4.4",
"@types/node-fetch": "^2.1.3",
"@types/proxyquire": "^1.3.28",
"@types/request": "^2.48.4",
"@types/sinon": "^10.0.0",
"@types/sinon": "^10.0.15",
"@types/tmp": "0.2.3",
"@types/uuid": "^8.0.0",
"@types/yargs": "^17.0.10",
"c8": "^8.0.0",
"form-data": "^4.0.0",
"gts": "^3.1.0",
"gts": "^3.1.1",
"jsdoc": "^4.0.0",
"jsdoc-fresh": "^2.0.0",
"jsdoc-region-tag": "^2.0.0",
Expand All @@ -98,9 +98,9 @@
"nock": "~13.3.0",
"node-fetch": "^2.6.7",
"proxyquire": "^2.1.3",
"sinon": "^15.0.0",
"sinon": "^15.2.0",
"tmp": "^0.2.0",
"typescript": "^4.6.4",
"typescript": "^5.1.6",
"yargs": "^17.3.1"
}
}
4 changes: 2 additions & 2 deletions test/resumable-upload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1618,7 +1618,7 @@ describe('resumable-upload', () => {
const scope = nock(REQ_OPTS.url!).get(queryPath).reply(500, {error});
await assert.rejects(up.makeRequest(REQ_OPTS), (err: GaxiosError) => {
scope.done();
assert.strictEqual(err.code, '500');
assert.strictEqual(err.status, 500);
return true;
});
});
Expand All @@ -1635,7 +1635,7 @@ describe('resumable-upload', () => {
const scope = nock(REQ_OPTS.url!).get(queryPath).reply(500, {error});
await assert.rejects(up.makeRequest(REQ_OPTS), (err: GaxiosError) => {
scope.done();
assert.deepStrictEqual(err.code, '500');
assert.deepStrictEqual(err.status, 500);
return true;
});
});
Expand Down

0 comments on commit a8ab62b

Please sign in to comment.