From 564b7a95f5d46dbd3db86d0892bf63208b7f4859 Mon Sep 17 00:00:00 2001 From: James Sumners Date: Tue, 16 Apr 2024 08:57:49 -0400 Subject: [PATCH] chore: Enabled quiet mode for CI runs --- .github/workflows/ci-workflow.yml | 4 ++ THIRD_PARTY_NOTICES.md | 18 ++++---- bin/run-versioned-tests.sh | 14 +++++++ package.json | 8 ++-- third_party_manifest.json | 70 +++++++++++++++---------------- 5 files changed, 66 insertions(+), 48 deletions(-) create mode 100755 bin/run-versioned-tests.sh diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index dd817f13..f73ddc96 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -2,6 +2,10 @@ name: Next.js Instrumentation CI on: [push, pull_request, workflow_dispatch] +env: + # Enable versioned runner quiet mode to make CI output easier to read: + OUTPUT_MODE: quiet + jobs: lint: runs-on: ubuntu-latest diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 10568cb8..feb6fa21 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -34,7 +34,7 @@ code, the source code can be found at [https://github.com/newrelic/newrelic-node ### semver -This product includes source derived from [semver](https://github.com/npm/node-semver) ([v7.5.4](https://github.com/npm/node-semver/tree/v7.5.4)), distributed under the [ISC License](https://github.com/npm/node-semver/blob/v7.5.4/LICENSE): +This product includes source derived from [semver](https://github.com/npm/node-semver) ([v7.6.0](https://github.com/npm/node-semver/tree/v7.6.0)), distributed under the [ISC License](https://github.com/npm/node-semver/blob/v7.6.0/LICENSE): ``` The ISC License @@ -477,7 +477,7 @@ This product includes source derived from [@newrelic/newrelic-oss-cli](https://g ### @newrelic/test-utilities -This product includes source derived from [@newrelic/test-utilities](https://github.com/newrelic/node-test-utilities) ([v8.1.0](https://github.com/newrelic/node-test-utilities/tree/v8.1.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-test-utilities/blob/v8.1.0/LICENSE): +This product includes source derived from [@newrelic/test-utilities](https://github.com/newrelic/node-test-utilities) ([v8.5.0](https://github.com/newrelic/node-test-utilities/tree/v8.5.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-test-utilities/blob/v8.5.0/LICENSE): ``` Apache License @@ -686,7 +686,7 @@ This product includes source derived from [@newrelic/test-utilities](https://git ### c8 -This product includes source derived from [c8](https://github.com/bcoe/c8) ([v7.12.0](https://github.com/bcoe/c8/tree/v7.12.0)), distributed under the [ISC License](https://github.com/bcoe/c8/blob/v7.12.0/LICENSE.txt): +This product includes source derived from [c8](https://github.com/bcoe/c8) ([v7.14.0](https://github.com/bcoe/c8/tree/v7.14.0)), distributed under the [ISC License](https://github.com/bcoe/c8/blob/v7.14.0/LICENSE.txt): ``` Copyright (c) 2017, Contributors @@ -708,7 +708,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ### husky -This product includes source derived from [husky](https://github.com/typicode/husky) ([v8.0.1](https://github.com/typicode/husky/tree/v8.0.1)), distributed under the [MIT License](https://github.com/typicode/husky/blob/v8.0.1/LICENSE): +This product includes source derived from [husky](https://github.com/typicode/husky) ([v8.0.3](https://github.com/typicode/husky/tree/v8.0.3)), distributed under the [MIT License](https://github.com/typicode/husky/blob/v8.0.3/LICENSE): ``` MIT License @@ -766,7 +766,7 @@ SOFTWARE. ### lockfile-lint -This product includes source derived from [lockfile-lint](https://github.com/lirantal/lockfile-lint) ([v4.9.6](https://github.com/lirantal/lockfile-lint/tree/v4.9.6)), distributed under the [Apache-2.0 License](https://github.com/lirantal/lockfile-lint/blob/v4.9.6/LICENSE): +This product includes source derived from [lockfile-lint](https://github.com/lirantal/lockfile-lint) ([v4.13.2](https://github.com/lirantal/lockfile-lint/tree/v4.13.2)), distributed under the [Apache-2.0 License](https://github.com/lirantal/lockfile-lint/blob/v4.13.2/LICENSE): ``` @@ -964,7 +964,7 @@ This product includes source derived from [lockfile-lint](https://github.com/lir ### newrelic -This product includes source derived from [newrelic](https://github.com/newrelic/node-newrelic) ([v11.5.0](https://github.com/newrelic/node-newrelic/tree/v11.5.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic/blob/v11.5.0/LICENSE): +This product includes source derived from [newrelic](https://github.com/newrelic/node-newrelic) ([v11.15.0](https://github.com/newrelic/node-newrelic/tree/v11.15.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic/blob/v11.15.0/LICENSE): ``` Apache License @@ -1172,7 +1172,7 @@ This product includes source derived from [newrelic](https://github.com/newrelic ### sinon -This product includes source derived from [sinon](https://github.com/sinonjs/sinon) ([v14.0.1](https://github.com/sinonjs/sinon/tree/v14.0.1)), distributed under the [BSD-3-Clause License](https://github.com/sinonjs/sinon/blob/v14.0.1/LICENSE): +This product includes source derived from [sinon](https://github.com/sinonjs/sinon) ([v14.0.2](https://github.com/sinonjs/sinon/tree/v14.0.2)), distributed under the [BSD-3-Clause License](https://github.com/sinonjs/sinon/blob/v14.0.2/LICENSE): ``` (The BSD License) @@ -1207,12 +1207,12 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ### tap -This product includes source derived from [tap](https://github.com/tapjs/node-tap) ([v16.3.0](https://github.com/tapjs/node-tap/tree/v16.3.0)), distributed under the [ISC License](https://github.com/tapjs/node-tap/blob/v16.3.0/LICENSE): +This product includes source derived from [tap](https://github.com/tapjs/node-tap) ([v16.3.10](https://github.com/tapjs/node-tap/tree/v16.3.10)), distributed under the [ISC License](https://github.com/tapjs/node-tap/blob/v16.3.10/LICENSE): ``` The ISC License -Copyright (c) 2011-2022 Isaac Z. Schlueter and Contributors +Copyright (c) 2011-2023 Isaac Z. Schlueter and Contributors Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/bin/run-versioned-tests.sh b/bin/run-versioned-tests.sh new file mode 100755 index 00000000..9ebbd468 --- /dev/null +++ b/bin/run-versioned-tests.sh @@ -0,0 +1,14 @@ +#! /bin/bash + +set -x +VERSIONED_MODE="${VERSIONED_MODE:---minor}" +SAMPLES="${SAMPLES:-15}" +C8_REPORTER="${C8_REPORTER:-lcov}" + +C8="c8 -o ./coverage/versioned --merge-async -r $C8_REPORTER" + +# OUTPUT_MODE maps to `--print` of the versioned-tests runner. +# Known values are "simple", "pretty", and "quiet". +OUTPUT_MODE="${OUTPUT_MODE:-pretty}" + +$C8 ./node_modules/.bin/versioned-tests $VERSIONED_MODE --print $OUTPUT_MODE --samples $SAMPLES --all -i 2 'tests/versioned/*.tap.js' diff --git a/package.json b/package.json index d067f8ba..3d0dc5cf 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,8 @@ "test": "npm run unit && npm run versioned", "third-party-updates": "oss third-party manifest && oss third-party notices && git add THIRD_PARTY_NOTICES.md third_party_manifest.json", "unit": "c8 -o ./coverage/unit tap --test-regex='(\\/|^tests\\/unit\\/.*\\.test\\.js)$' --no-coverage", - "versioned": "c8 -o ./coverage/versioned versioned-tests --minor --all -i 2 'tests/versioned/*.tap.js'", - "versioned:major": "versioned-tests --major --all -i 2 'tests/versioned/*.tap.js'" + "versioned": "./bin/run-versioned-tests.sh", + "versioned:major": "VERSIONED_MODE=--major npm run versioned" }, "files": [ "README.md", @@ -39,12 +39,12 @@ "devDependencies": { "@newrelic/eslint-config": "^0.2.0", "@newrelic/newrelic-oss-cli": "^0.1.2", - "@newrelic/test-utilities": "^8.1.0", + "@newrelic/test-utilities": "^8.5.0", "c8": "^7.12.0", "husky": "^8.0.1", "lint-staged": "^12.4.2", "lockfile-lint": "^4.9.6", - "newrelic": "^11.12.0", + "newrelic": "^11.15.0", "sinon": "^14.0.0", "tap": "^16.2.0" }, diff --git a/third_party_manifest.json b/third_party_manifest.json index 7bb3748a..9a7a4baa 100644 --- a/third_party_manifest.json +++ b/third_party_manifest.json @@ -1,19 +1,19 @@ { - "lastUpdated": "Mon Mar 11 2024 17:07:20 GMT-0400 (Eastern Daylight Time)", + "lastUpdated": "Tue Apr 16 2024 08:57:50 GMT-0400 (Eastern Daylight Time)", "projectName": "New Relic Next.js Instrumentation", "projectUrl": "https://github.com/newrelic/newrelic-node-nextjs", "includeOptDeps": false, "includeDev": true, "dependencies": { - "semver@7.5.4": { + "semver@7.6.0": { "name": "semver", - "version": "7.5.4", + "version": "7.6.0", "range": "^7.3.7", "licenses": "ISC", "repoUrl": "https://github.com/npm/node-semver", - "versionedRepoUrl": "https://github.com/npm/node-semver/tree/v7.5.4", + "versionedRepoUrl": "https://github.com/npm/node-semver/tree/v7.6.0", "licenseFile": "node_modules/semver/LICENSE", - "licenseUrl": "https://github.com/npm/node-semver/blob/v7.5.4/LICENSE", + "licenseUrl": "https://github.com/npm/node-semver/blob/v7.6.0/LICENSE", "licenseTextSource": "file", "publisher": "GitHub Inc." } @@ -44,41 +44,41 @@ "licenseTextSource": "file", "publisher": "New Relic" }, - "@newrelic/test-utilities@8.1.0": { + "@newrelic/test-utilities@8.5.0": { "name": "@newrelic/test-utilities", - "version": "8.1.0", - "range": "^8.1.0", + "version": "8.5.0", + "range": "^8.5.0", "licenses": "Apache-2.0", "repoUrl": "https://github.com/newrelic/node-test-utilities", - "versionedRepoUrl": "https://github.com/newrelic/node-test-utilities/tree/v8.1.0", + "versionedRepoUrl": "https://github.com/newrelic/node-test-utilities/tree/v8.5.0", "licenseFile": "node_modules/@newrelic/test-utilities/LICENSE", - "licenseUrl": "https://github.com/newrelic/node-test-utilities/blob/v8.1.0/LICENSE", + "licenseUrl": "https://github.com/newrelic/node-test-utilities/blob/v8.5.0/LICENSE", "licenseTextSource": "file", "publisher": "New Relic Node.js agent team", "email": "nodejs@newrelic.com" }, - "c8@7.12.0": { + "c8@7.14.0": { "name": "c8", - "version": "7.12.0", + "version": "7.14.0", "range": "^7.12.0", "licenses": "ISC", "repoUrl": "https://github.com/bcoe/c8", - "versionedRepoUrl": "https://github.com/bcoe/c8/tree/v7.12.0", + "versionedRepoUrl": "https://github.com/bcoe/c8/tree/v7.14.0", "licenseFile": "node_modules/c8/LICENSE.txt", - "licenseUrl": "https://github.com/bcoe/c8/blob/v7.12.0/LICENSE.txt", + "licenseUrl": "https://github.com/bcoe/c8/blob/v7.14.0/LICENSE.txt", "licenseTextSource": "file", "publisher": "Ben Coe", "email": "ben@npmjs.com" }, - "husky@8.0.1": { + "husky@8.0.3": { "name": "husky", - "version": "8.0.1", + "version": "8.0.3", "range": "^8.0.1", "licenses": "MIT", "repoUrl": "https://github.com/typicode/husky", - "versionedRepoUrl": "https://github.com/typicode/husky/tree/v8.0.1", + "versionedRepoUrl": "https://github.com/typicode/husky/tree/v8.0.3", "licenseFile": "node_modules/husky/LICENSE", - "licenseUrl": "https://github.com/typicode/husky/blob/v8.0.1/LICENSE", + "licenseUrl": "https://github.com/typicode/husky/blob/v8.0.3/LICENSE", "licenseTextSource": "file", "publisher": "Typicode", "email": "typicode@gmail.com" @@ -96,54 +96,54 @@ "publisher": "Andrey Okonetchnikov", "email": "andrey@okonet.ru" }, - "lockfile-lint@4.9.6": { + "lockfile-lint@4.13.2": { "name": "lockfile-lint", - "version": "4.9.6", + "version": "4.13.2", "range": "^4.9.6", "licenses": "Apache-2.0", "repoUrl": "https://github.com/lirantal/lockfile-lint", - "versionedRepoUrl": "https://github.com/lirantal/lockfile-lint/tree/v4.9.6", + "versionedRepoUrl": "https://github.com/lirantal/lockfile-lint/tree/v4.13.2", "licenseFile": "node_modules/lockfile-lint/LICENSE", - "licenseUrl": "https://github.com/lirantal/lockfile-lint/blob/v4.9.6/LICENSE", + "licenseUrl": "https://github.com/lirantal/lockfile-lint/blob/v4.13.2/LICENSE", "licenseTextSource": "file", "publisher": "Liran Tal", "email": "liran.tal@gmail.com", "url": "https://github.com/lirantal" }, - "newrelic@11.5.0": { + "newrelic@11.15.0": { "name": "newrelic", - "version": "11.5.0", - "range": "^11.12.0", + "version": "11.15.0", + "range": "^11.15.0", "licenses": "Apache-2.0", "repoUrl": "https://github.com/newrelic/node-newrelic", - "versionedRepoUrl": "https://github.com/newrelic/node-newrelic/tree/v11.5.0", + "versionedRepoUrl": "https://github.com/newrelic/node-newrelic/tree/v11.15.0", "licenseFile": "node_modules/newrelic/LICENSE", - "licenseUrl": "https://github.com/newrelic/node-newrelic/blob/v11.5.0/LICENSE", + "licenseUrl": "https://github.com/newrelic/node-newrelic/blob/v11.15.0/LICENSE", "licenseTextSource": "file", "publisher": "New Relic Node.js agent team", "email": "nodejs@newrelic.com" }, - "sinon@14.0.1": { + "sinon@14.0.2": { "name": "sinon", - "version": "14.0.1", + "version": "14.0.2", "range": "^14.0.0", "licenses": "BSD-3-Clause", "repoUrl": "https://github.com/sinonjs/sinon", - "versionedRepoUrl": "https://github.com/sinonjs/sinon/tree/v14.0.1", + "versionedRepoUrl": "https://github.com/sinonjs/sinon/tree/v14.0.2", "licenseFile": "node_modules/sinon/LICENSE", - "licenseUrl": "https://github.com/sinonjs/sinon/blob/v14.0.1/LICENSE", + "licenseUrl": "https://github.com/sinonjs/sinon/blob/v14.0.2/LICENSE", "licenseTextSource": "file", "publisher": "Christian Johansen" }, - "tap@16.3.0": { + "tap@16.3.10": { "name": "tap", - "version": "16.3.0", + "version": "16.3.10", "range": "^16.2.0", "licenses": "ISC", "repoUrl": "https://github.com/tapjs/node-tap", - "versionedRepoUrl": "https://github.com/tapjs/node-tap/tree/v16.3.0", + "versionedRepoUrl": "https://github.com/tapjs/node-tap/tree/v16.3.10", "licenseFile": "node_modules/tap/LICENSE", - "licenseUrl": "https://github.com/tapjs/node-tap/blob/v16.3.0/LICENSE", + "licenseUrl": "https://github.com/tapjs/node-tap/blob/v16.3.10/LICENSE", "licenseTextSource": "file", "publisher": "Isaac Z. Schlueter", "email": "i@izs.me",