From 9c5960eaf19bcbb2e22755b1f80ea57a1904e67b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrg=C3=BCn=20Day=C4=B1o=C4=9Flu?= Date: Fri, 19 Apr 2024 21:39:12 +0200 Subject: [PATCH 01/10] use default node versions --- .github/workflows/plugins-ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/plugins-ci.yml b/.github/workflows/plugins-ci.yml index 7470aef..e674363 100644 --- a/.github/workflows/plugins-ci.yml +++ b/.github/workflows/plugins-ci.yml @@ -28,6 +28,11 @@ on: required: false default: false type: boolean + node-versions: + description: 'A comma-separated list of Node versions to test against.' + required: false + default: '["18", "20", "21"]' + type: string jobs: dependency-review: @@ -103,7 +108,7 @@ jobs: contents: read strategy: matrix: - node-version: [18, 20, 21] + node-version: ${{ fromJson(inputs.node-versions) }} os: [macos-latest, ubuntu-latest, windows-latest] steps: - name: Check out repo From 4dac12aaf8067d8024ee54f136a0fe34114b5549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrg=C3=BCn=20Day=C4=B1o=C4=9Flu?= Date: Sun, 21 Apr 2024 11:42:29 +0200 Subject: [PATCH 02/10] add to other workflows --- .github/workflows/plugins-benchmark-pr.yml | 8 +++++++- .github/workflows/plugins-ci-mongo.yml | 9 +++++++-- .github/workflows/plugins-ci-mysql.yml | 9 +++++++-- .github/workflows/plugins-ci-package-manager.yml | 14 ++++++++++---- .github/workflows/plugins-ci-postgres.yml | 9 +++++++-- .github/workflows/plugins-ci-redis.yml | 8 +++++++- 6 files changed, 45 insertions(+), 12 deletions(-) diff --git a/.github/workflows/plugins-benchmark-pr.yml b/.github/workflows/plugins-benchmark-pr.yml index 38c8554..9cd6dc4 100644 --- a/.github/workflows/plugins-benchmark-pr.yml +++ b/.github/workflows/plugins-benchmark-pr.yml @@ -7,6 +7,11 @@ on: type: string default: benchmark required: false + node-versions: + description: 'A comma-separated list of Node versions to test against.' + required: false + default: '["18", "20", "21"]' + type: string jobs: benchmark: @@ -24,7 +29,8 @@ jobs: strategy: matrix: - node-version: [18, 20, 21] + node-version: ${{ fromJson(inputs.node-versions) }} + os: [macos-latest, ubuntu-latest, windows-latest] steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/plugins-ci-mongo.yml b/.github/workflows/plugins-ci-mongo.yml index 3ef6ed1..15c6cbc 100644 --- a/.github/workflows/plugins-ci-mongo.yml +++ b/.github/workflows/plugins-ci-mongo.yml @@ -23,6 +23,11 @@ on: required: false default: false type: boolean + node-versions: + description: 'A comma-separated list of Node versions to test against.' + required: false + default: '["18", "20", "21"]' + type: string jobs: dependency-review: @@ -98,8 +103,8 @@ jobs: contents: read strategy: matrix: - node-version: [18, 20, 21] - os: [ubuntu-latest] + node-version: ${{ fromJson(inputs.node-versions) }} + os: [macos-latest, ubuntu-latest, windows-latest] db: [5] services: diff --git a/.github/workflows/plugins-ci-mysql.yml b/.github/workflows/plugins-ci-mysql.yml index 4a82569..f54681c 100644 --- a/.github/workflows/plugins-ci-mysql.yml +++ b/.github/workflows/plugins-ci-mysql.yml @@ -23,6 +23,11 @@ on: required: false default: false type: boolean + node-versions: + description: 'A comma-separated list of Node versions to test against.' + required: false + default: '["18", "20", "21"]' + type: string jobs: dependency-review: @@ -100,8 +105,8 @@ jobs: contents: read strategy: matrix: - node-version: [18, 20, 21] - os: [ubuntu-latest] + node-version: ${{ fromJson(inputs.node-versions) }} + os: [macos-latest, ubuntu-latest, windows-latest] db: ['mysql:8.0'] services: diff --git a/.github/workflows/plugins-ci-package-manager.yml b/.github/workflows/plugins-ci-package-manager.yml index a1c0db7..2798af8 100644 --- a/.github/workflows/plugins-ci-package-manager.yml +++ b/.github/workflows/plugins-ci-package-manager.yml @@ -2,6 +2,12 @@ name: Plugin CI - Package Managers on: workflow_call: + inputs: + node-versions: + description: 'A comma-separated list of Node versions to test against.' + required: false + default: '["18", "20", "21"]' + type: string jobs: pnpm: @@ -11,8 +17,8 @@ jobs: contents: read strategy: matrix: - node-version: [18, 20, 21] - os: [ubuntu-latest] + node-version: ${{ fromJson(inputs.node-versions) }} + os: [macos-latest, ubuntu-latest, windows-latest] pnpm-version: [8] steps: @@ -44,8 +50,8 @@ jobs: contents: read strategy: matrix: - node-version: [18, 20, 21] - os: [ubuntu-latest] + node-version: ${{ fromJson(inputs.node-versions) }} + os: [macos-latest, ubuntu-latest, windows-latest] steps: - name: Check out repo uses: actions/checkout@v4 diff --git a/.github/workflows/plugins-ci-postgres.yml b/.github/workflows/plugins-ci-postgres.yml index 25fe7c8..f34c4c5 100644 --- a/.github/workflows/plugins-ci-postgres.yml +++ b/.github/workflows/plugins-ci-postgres.yml @@ -23,6 +23,11 @@ on: required: false default: false type: boolean + node-versions: + description: 'A comma-separated list of Node versions to test against.' + required: false + default: '["18", "20", "21"]' + type: string jobs: dependency-review: @@ -98,8 +103,8 @@ jobs: contents: read strategy: matrix: - node-version: [18, 20, 21] - os: [ubuntu-latest] + node-version: ${{ fromJson(inputs.node-versions) }} + os: [macos-latest, ubuntu-latest, windows-latest] db: ['postgres:11-alpine'] services: diff --git a/.github/workflows/plugins-ci-redis.yml b/.github/workflows/plugins-ci-redis.yml index 94198f4..4dc0c43 100644 --- a/.github/workflows/plugins-ci-redis.yml +++ b/.github/workflows/plugins-ci-redis.yml @@ -23,6 +23,11 @@ on: required: false default: false type: boolean + node-versions: + description: 'A comma-separated list of Node versions to test against.' + required: false + default: '["18", "20", "21"]' + type: string jobs: dependency-review: @@ -96,7 +101,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [18, 20, 21] + node-version: ${{ fromJson(inputs.node-versions) }} + os: [macos-latest, ubuntu-latest, windows-latest] db: [5, 6, 7] services: redis: From 72a42027b3e0ee90ae4d37b9bebf4056541ddedb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrg=C3=BCn=20Day=C4=B1o=C4=9Flu?= Date: Sun, 21 Apr 2024 11:44:50 +0200 Subject: [PATCH 03/10] spacing --- .github/workflows/plugins-benchmark-pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/plugins-benchmark-pr.yml b/.github/workflows/plugins-benchmark-pr.yml index 029b5e6..a13df70 100644 --- a/.github/workflows/plugins-benchmark-pr.yml +++ b/.github/workflows/plugins-benchmark-pr.yml @@ -36,6 +36,7 @@ on: required: false default: '["18", "20", "21"]' type: string + jobs: benchmark: if: ${{ github.event.label.name == 'benchmark' }} From c269ffd64f72a6be414e557be4731d25430b24dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrg=C3=BCn=20Day=C4=B1o=C4=9Flu?= Date: Mon, 22 Apr 2024 15:20:29 +0200 Subject: [PATCH 04/10] remove os matrix when it's not used --- .github/workflows/plugins-benchmark-pr.yml | 4 +--- .github/workflows/plugins-ci-kafka.yml | 7 ++++++- .github/workflows/plugins-ci-mongo.yml | 3 +-- .github/workflows/plugins-ci-mysql.yml | 3 +-- .github/workflows/plugins-ci-postgres.yml | 3 +-- .github/workflows/plugins-ci-redis.yml | 1 - README.md | 3 +-- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/plugins-benchmark-pr.yml b/.github/workflows/plugins-benchmark-pr.yml index a13df70..d4fec12 100644 --- a/.github/workflows/plugins-benchmark-pr.yml +++ b/.github/workflows/plugins-benchmark-pr.yml @@ -54,7 +54,6 @@ jobs: strategy: matrix: node-version: ${{ fromJson(inputs.node-versions) }} - os: [macos-latest, ubuntu-latest, windows-latest] steps: - name: Checkout ${{ inputs.pr-repo }}@${{ inputs.pr-ref }} uses: actions/checkout@v4 @@ -97,8 +96,7 @@ jobs: echo 'EOF' >> $GITHUB_OUTPUT output-benchmark: - needs: - - benchmark + needs: benchmark runs-on: ubuntu-latest permissions: pull-requests: write diff --git a/.github/workflows/plugins-ci-kafka.yml b/.github/workflows/plugins-ci-kafka.yml index 2a3659a..2677ff8 100644 --- a/.github/workflows/plugins-ci-kafka.yml +++ b/.github/workflows/plugins-ci-kafka.yml @@ -23,6 +23,11 @@ on: required: false default: false type: boolean + node-versions: + description: 'A comma-separated list of Node versions to test against.' + required: false + default: '["18", "20", "21"]' + type: string jobs: dependency-review: @@ -96,7 +101,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [18, 20, 21] + node-version: ${{ fromJson(inputs.node-versions) }} services: zookeeper: image: 'confluentinc/cp-zookeeper:7.4.3' diff --git a/.github/workflows/plugins-ci-mongo.yml b/.github/workflows/plugins-ci-mongo.yml index 77d1264..828b10e 100644 --- a/.github/workflows/plugins-ci-mongo.yml +++ b/.github/workflows/plugins-ci-mongo.yml @@ -98,13 +98,12 @@ jobs: test: name: Node.js ${{ matrix.node-version }} - ${{ matrix.db }} - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest permissions: contents: read strategy: matrix: node-version: ${{ fromJson(inputs.node-versions) }} - os: [macos-latest, ubuntu-latest, windows-latest] db: [5] services: diff --git a/.github/workflows/plugins-ci-mysql.yml b/.github/workflows/plugins-ci-mysql.yml index 5686bc4..6a1c7bc 100644 --- a/.github/workflows/plugins-ci-mysql.yml +++ b/.github/workflows/plugins-ci-mysql.yml @@ -100,13 +100,12 @@ jobs: test: name: Node.js ${{ matrix.node-version }} - ${{ matrix.db }} - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest permissions: contents: read strategy: matrix: node-version: ${{ fromJson(inputs.node-versions) }} - os: [macos-latest, ubuntu-latest, windows-latest] db: ['mysql:8.0'] services: diff --git a/.github/workflows/plugins-ci-postgres.yml b/.github/workflows/plugins-ci-postgres.yml index ff89a5a..7ad7cd9 100644 --- a/.github/workflows/plugins-ci-postgres.yml +++ b/.github/workflows/plugins-ci-postgres.yml @@ -98,13 +98,12 @@ jobs: test: name: Node.js ${{ matrix.node-version }} - ${{ matrix.db }} - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest permissions: contents: read strategy: matrix: node-version: ${{ fromJson(inputs.node-versions) }} - os: [macos-latest, ubuntu-latest, windows-latest] db: ['postgres:11-alpine'] services: diff --git a/.github/workflows/plugins-ci-redis.yml b/.github/workflows/plugins-ci-redis.yml index fcf7394..51a42d4 100644 --- a/.github/workflows/plugins-ci-redis.yml +++ b/.github/workflows/plugins-ci-redis.yml @@ -102,7 +102,6 @@ jobs: strategy: matrix: node-version: ${{ fromJson(inputs.node-versions) }} - os: [macos-latest, ubuntu-latest, windows-latest] db: [5, 6, 7] services: redis: diff --git a/README.md b/README.md index e339b21..2fe864c 100644 --- a/README.md +++ b/README.md @@ -92,8 +92,7 @@ jobs: remove-label: if: "always()" - needs: - - benchmark + needs: benchmark runs-on: ubuntu-latest steps: - name: Remove benchmark label From e99e44f48b9dc3e878f8df31715566e07b4209ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrg=C3=BCn=20Day=C4=B1o=C4=9Flu?= Date: Mon, 22 Apr 2024 15:22:29 +0200 Subject: [PATCH 05/10] spacing --- .github/workflows/plugins-ci-mongo.yml | 1 - .github/workflows/plugins-ci-mysql.yml | 1 - .github/workflows/plugins-ci-postgres.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/.github/workflows/plugins-ci-mongo.yml b/.github/workflows/plugins-ci-mongo.yml index 828b10e..9dc1fc1 100644 --- a/.github/workflows/plugins-ci-mongo.yml +++ b/.github/workflows/plugins-ci-mongo.yml @@ -105,7 +105,6 @@ jobs: matrix: node-version: ${{ fromJson(inputs.node-versions) }} db: [5] - services: mongo: image: mongo:${{ matrix.db }} diff --git a/.github/workflows/plugins-ci-mysql.yml b/.github/workflows/plugins-ci-mysql.yml index 6a1c7bc..0121dc2 100644 --- a/.github/workflows/plugins-ci-mysql.yml +++ b/.github/workflows/plugins-ci-mysql.yml @@ -107,7 +107,6 @@ jobs: matrix: node-version: ${{ fromJson(inputs.node-versions) }} db: ['mysql:8.0'] - services: mysql: image: ${{ matrix.db }} diff --git a/.github/workflows/plugins-ci-postgres.yml b/.github/workflows/plugins-ci-postgres.yml index 7ad7cd9..0793d43 100644 --- a/.github/workflows/plugins-ci-postgres.yml +++ b/.github/workflows/plugins-ci-postgres.yml @@ -105,7 +105,6 @@ jobs: matrix: node-version: ${{ fromJson(inputs.node-versions) }} db: ['postgres:11-alpine'] - services: postgres: image: ${{ matrix.db }} From 6667738a8ce0797e5c7b93261435b057e6a246ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrg=C3=BCn=20Day=C4=B1o=C4=9Flu?= Date: Mon, 22 Apr 2024 17:16:47 +0200 Subject: [PATCH 06/10] only test package managers on ubuntu, as is the case with fastify/fastify --- .github/workflows/plugins-ci-package-manager.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/plugins-ci-package-manager.yml b/.github/workflows/plugins-ci-package-manager.yml index ffc7eb8..f731e3a 100644 --- a/.github/workflows/plugins-ci-package-manager.yml +++ b/.github/workflows/plugins-ci-package-manager.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: node-version: ${{ fromJson(inputs.node-versions) }} - os: [macos-latest, ubuntu-latest, windows-latest] + os: [ubuntu-latest] pnpm-version: [8] steps: @@ -51,7 +51,7 @@ jobs: strategy: matrix: node-version: ${{ fromJson(inputs.node-versions) }} - os: [macos-latest, ubuntu-latest, windows-latest] + os: [ubuntu-latest] steps: - name: Check out repo uses: actions/checkout@v4 From 2b5421ea5e343a6de0fa92d1e3ae4ef50117f30b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrg=C3=BCn=20Day=C4=B1o=C4=9Flu?= Date: Mon, 22 Apr 2024 17:16:50 +0200 Subject: [PATCH 07/10] update readme --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2fe864c..7da0ff9 100644 --- a/README.md +++ b/README.md @@ -64,10 +64,11 @@ jobs: | Input Name | Required | Type | Default | Description | | ---------------------------------- | ---------- | ------- | --------- | ---------------------------------------------------------------------------------- | -| `auto-merge-exclude` | false | string | `fastify` | Provide a semicolon separated list of packages that you do not want to be auto-merged. | -| `license-check` | false | boolean | `false` | Set to `true` to check that a repository's production dependencies use permissive licenses: 0BSD, Apache-2.0, BSD-2-Clause, BSD-3-Clause, MIT, or ISC. | -| `license-check-allowed-additional` | false | string | | Provide a semicolon separated list of SPDX-license identifiers that you want to additionally allow. | -| `lint` | false | boolean | `false` | Set to `true` to run the `lint` script in a repository's `package.json`. | +| `auto-merge-exclude` | false | string | `fastify` | Provide a semicolon separated list of packages that you do not want to be auto-merged. | +| `license-check` | false | boolean | `false` | Set to `true` to check that a repository's production dependencies use permissive licenses: 0BSD, Apache-2.0, BSD-2-Clause, BSD-3-Clause, MIT, or ISC. | +| `license-check-allowed-additional` | false | string | | Provide a semicolon separated list of SPDX-license identifiers that you want to additionally allow. | +| `lint` | false | boolean | `false` | Set to `true` to run the `lint` script in a repository's `package.json`. | +| `node-versions` | false | string | `'["18", "20", "21"]'` | Provide a stringified JSON array that specifies the Node.js versions on which the tests should run. | ## Benchmark PR workflow From 6724e17c9e822f2d060ccf4095a5b06bf1253b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrg=C3=BCn=20Day=C4=B1o=C4=9Flu?= Date: Mon, 22 Apr 2024 17:23:17 +0200 Subject: [PATCH 08/10] update desc --- .github/workflows/plugins-benchmark-pr.yml | 2 +- .github/workflows/plugins-ci-kafka.yml | 2 +- .github/workflows/plugins-ci-mongo.yml | 2 +- .github/workflows/plugins-ci-mysql.yml | 2 +- .github/workflows/plugins-ci-package-manager.yml | 2 +- .github/workflows/plugins-ci-postgres.yml | 2 +- .github/workflows/plugins-ci-redis.yml | 2 +- .github/workflows/plugins-ci.yml | 2 +- README.md | 3 ++- 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/plugins-benchmark-pr.yml b/.github/workflows/plugins-benchmark-pr.yml index d4fec12..9ca9b91 100644 --- a/.github/workflows/plugins-benchmark-pr.yml +++ b/.github/workflows/plugins-benchmark-pr.yml @@ -32,7 +32,7 @@ on: default: ${{ github.event.pull_request.base.ref }} required: false node-versions: - description: 'A comma-separated list of Node versions to test against.' + description: 'A stringified JSON array that specifies the Node.js versions on which the job should run.' required: false default: '["18", "20", "21"]' type: string diff --git a/.github/workflows/plugins-ci-kafka.yml b/.github/workflows/plugins-ci-kafka.yml index 2677ff8..69d181e 100644 --- a/.github/workflows/plugins-ci-kafka.yml +++ b/.github/workflows/plugins-ci-kafka.yml @@ -24,7 +24,7 @@ on: default: false type: boolean node-versions: - description: 'A comma-separated list of Node versions to test against.' + description: 'A stringified JSON array that specifies the Node.js versions on which the job should run.' required: false default: '["18", "20", "21"]' type: string diff --git a/.github/workflows/plugins-ci-mongo.yml b/.github/workflows/plugins-ci-mongo.yml index 9dc1fc1..d343aed 100644 --- a/.github/workflows/plugins-ci-mongo.yml +++ b/.github/workflows/plugins-ci-mongo.yml @@ -24,7 +24,7 @@ on: default: false type: boolean node-versions: - description: 'A comma-separated list of Node versions to test against.' + description: 'A stringified JSON array that specifies the Node.js versions on which the job should run.' required: false default: '["18", "20", "21"]' type: string diff --git a/.github/workflows/plugins-ci-mysql.yml b/.github/workflows/plugins-ci-mysql.yml index 0121dc2..4305138 100644 --- a/.github/workflows/plugins-ci-mysql.yml +++ b/.github/workflows/plugins-ci-mysql.yml @@ -24,7 +24,7 @@ on: default: false type: boolean node-versions: - description: 'A comma-separated list of Node versions to test against.' + description: 'A stringified JSON array that specifies the Node.js versions on which the job should run.' required: false default: '["18", "20", "21"]' type: string diff --git a/.github/workflows/plugins-ci-package-manager.yml b/.github/workflows/plugins-ci-package-manager.yml index f731e3a..2dc50db 100644 --- a/.github/workflows/plugins-ci-package-manager.yml +++ b/.github/workflows/plugins-ci-package-manager.yml @@ -4,7 +4,7 @@ on: workflow_call: inputs: node-versions: - description: 'A comma-separated list of Node versions to test against.' + description: 'A stringified JSON array that specifies the Node.js versions on which the job should run.' required: false default: '["18", "20", "21"]' type: string diff --git a/.github/workflows/plugins-ci-postgres.yml b/.github/workflows/plugins-ci-postgres.yml index 0793d43..216593a 100644 --- a/.github/workflows/plugins-ci-postgres.yml +++ b/.github/workflows/plugins-ci-postgres.yml @@ -24,7 +24,7 @@ on: default: false type: boolean node-versions: - description: 'A comma-separated list of Node versions to test against.' + description: 'A stringified JSON array that specifies the Node.js versions on which the job should run.' required: false default: '["18", "20", "21"]' type: string diff --git a/.github/workflows/plugins-ci-redis.yml b/.github/workflows/plugins-ci-redis.yml index 51a42d4..a947aae 100644 --- a/.github/workflows/plugins-ci-redis.yml +++ b/.github/workflows/plugins-ci-redis.yml @@ -24,7 +24,7 @@ on: default: false type: boolean node-versions: - description: 'A comma-separated list of Node versions to test against.' + description: 'A stringified JSON array that specifies the Node.js versions on which the job should run.' required: false default: '["18", "20", "21"]' type: string diff --git a/.github/workflows/plugins-ci.yml b/.github/workflows/plugins-ci.yml index edf4cdb..2559e86 100644 --- a/.github/workflows/plugins-ci.yml +++ b/.github/workflows/plugins-ci.yml @@ -29,7 +29,7 @@ on: default: false type: boolean node-versions: - description: 'A comma-separated list of Node versions to test against.' + description: 'A stringified JSON array that specifies the Node.js versions on which the job should run.' required: false default: '["18", "20", "21"]' type: string diff --git a/README.md b/README.md index 7da0ff9..7de834d 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ jobs: | `license-check` | false | boolean | `false` | Set to `true` to check that a repository's production dependencies use permissive licenses: 0BSD, Apache-2.0, BSD-2-Clause, BSD-3-Clause, MIT, or ISC. | | `license-check-allowed-additional` | false | string | | Provide a semicolon separated list of SPDX-license identifiers that you want to additionally allow. | | `lint` | false | boolean | `false` | Set to `true` to run the `lint` script in a repository's `package.json`. | -| `node-versions` | false | string | `'["18", "20", "21"]'` | Provide a stringified JSON array that specifies the Node.js versions on which the tests should run. | +| `node-versions` | false | string | `'["18", "20", "21"]'` | Provide a stringified JSON array that specifies the Node.js versions on which the job should run. | ## Benchmark PR workflow @@ -112,6 +112,7 @@ jobs: | Input Name | Required | Type | Default | Description | | ---------------------------------- | ---------- | ------- | ----------- | ---------------------------------------------------------------------------------- | | `npm-script` | false | string | `benchmark` | Provide the name of the npm script to run | +| `node-versions` | false | string | `'["18", "20", "21"]'` | Provide a stringified JSON array that specifies the Node.js versions on which the job should run. | ## Acknowledgements From 3b816fd486799afa5d58c83eeaff50513c1c1377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrg=C3=BCn=20Day=C4=B1o=C4=9Flu?= Date: Mon, 22 Apr 2024 17:27:11 +0200 Subject: [PATCH 09/10] remove stringified --- .github/workflows/plugins-benchmark-pr.yml | 5 +++-- .github/workflows/plugins-ci-kafka.yml | 2 +- .github/workflows/plugins-ci-mongo.yml | 2 +- .github/workflows/plugins-ci-mysql.yml | 2 +- .github/workflows/plugins-ci-package-manager.yml | 2 +- .github/workflows/plugins-ci-postgres.yml | 2 +- .github/workflows/plugins-ci-redis.yml | 2 +- .github/workflows/plugins-ci.yml | 2 +- README.md | 4 ++-- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/plugins-benchmark-pr.yml b/.github/workflows/plugins-benchmark-pr.yml index 9ca9b91..f1be030 100644 --- a/.github/workflows/plugins-benchmark-pr.yml +++ b/.github/workflows/plugins-benchmark-pr.yml @@ -32,7 +32,7 @@ on: default: ${{ github.event.pull_request.base.ref }} required: false node-versions: - description: 'A stringified JSON array that specifies the Node.js versions on which the job should run.' + description: 'A JSON array that specifies the Node.js versions on which the job should run.' required: false default: '["18", "20", "21"]' type: string @@ -40,7 +40,7 @@ on: jobs: benchmark: if: ${{ github.event.label.name == 'benchmark' }} - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} permissions: contents: read outputs: @@ -54,6 +54,7 @@ jobs: strategy: matrix: node-version: ${{ fromJson(inputs.node-versions) }} + os: [ubuntu-latest] steps: - name: Checkout ${{ inputs.pr-repo }}@${{ inputs.pr-ref }} uses: actions/checkout@v4 diff --git a/.github/workflows/plugins-ci-kafka.yml b/.github/workflows/plugins-ci-kafka.yml index 69d181e..11eb915 100644 --- a/.github/workflows/plugins-ci-kafka.yml +++ b/.github/workflows/plugins-ci-kafka.yml @@ -24,7 +24,7 @@ on: default: false type: boolean node-versions: - description: 'A stringified JSON array that specifies the Node.js versions on which the job should run.' + description: 'A JSON array that specifies the Node.js versions on which the job should run.' required: false default: '["18", "20", "21"]' type: string diff --git a/.github/workflows/plugins-ci-mongo.yml b/.github/workflows/plugins-ci-mongo.yml index d343aed..f9256a5 100644 --- a/.github/workflows/plugins-ci-mongo.yml +++ b/.github/workflows/plugins-ci-mongo.yml @@ -24,7 +24,7 @@ on: default: false type: boolean node-versions: - description: 'A stringified JSON array that specifies the Node.js versions on which the job should run.' + description: 'A JSON array that specifies the Node.js versions on which the job should run.' required: false default: '["18", "20", "21"]' type: string diff --git a/.github/workflows/plugins-ci-mysql.yml b/.github/workflows/plugins-ci-mysql.yml index 4305138..160bf2d 100644 --- a/.github/workflows/plugins-ci-mysql.yml +++ b/.github/workflows/plugins-ci-mysql.yml @@ -24,7 +24,7 @@ on: default: false type: boolean node-versions: - description: 'A stringified JSON array that specifies the Node.js versions on which the job should run.' + description: 'A JSON array that specifies the Node.js versions on which the job should run.' required: false default: '["18", "20", "21"]' type: string diff --git a/.github/workflows/plugins-ci-package-manager.yml b/.github/workflows/plugins-ci-package-manager.yml index 2dc50db..6bcc6d9 100644 --- a/.github/workflows/plugins-ci-package-manager.yml +++ b/.github/workflows/plugins-ci-package-manager.yml @@ -4,7 +4,7 @@ on: workflow_call: inputs: node-versions: - description: 'A stringified JSON array that specifies the Node.js versions on which the job should run.' + description: 'A JSON array that specifies the Node.js versions on which the job should run.' required: false default: '["18", "20", "21"]' type: string diff --git a/.github/workflows/plugins-ci-postgres.yml b/.github/workflows/plugins-ci-postgres.yml index 216593a..6b3a316 100644 --- a/.github/workflows/plugins-ci-postgres.yml +++ b/.github/workflows/plugins-ci-postgres.yml @@ -24,7 +24,7 @@ on: default: false type: boolean node-versions: - description: 'A stringified JSON array that specifies the Node.js versions on which the job should run.' + description: 'A JSON array that specifies the Node.js versions on which the job should run.' required: false default: '["18", "20", "21"]' type: string diff --git a/.github/workflows/plugins-ci-redis.yml b/.github/workflows/plugins-ci-redis.yml index a947aae..3573da7 100644 --- a/.github/workflows/plugins-ci-redis.yml +++ b/.github/workflows/plugins-ci-redis.yml @@ -24,7 +24,7 @@ on: default: false type: boolean node-versions: - description: 'A stringified JSON array that specifies the Node.js versions on which the job should run.' + description: 'A JSON array that specifies the Node.js versions on which the job should run.' required: false default: '["18", "20", "21"]' type: string diff --git a/.github/workflows/plugins-ci.yml b/.github/workflows/plugins-ci.yml index 2559e86..2b621bb 100644 --- a/.github/workflows/plugins-ci.yml +++ b/.github/workflows/plugins-ci.yml @@ -29,7 +29,7 @@ on: default: false type: boolean node-versions: - description: 'A stringified JSON array that specifies the Node.js versions on which the job should run.' + description: 'A JSON array that specifies the Node.js versions on which the job should run.' required: false default: '["18", "20", "21"]' type: string diff --git a/README.md b/README.md index 7de834d..ee60ed9 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ jobs: | `license-check` | false | boolean | `false` | Set to `true` to check that a repository's production dependencies use permissive licenses: 0BSD, Apache-2.0, BSD-2-Clause, BSD-3-Clause, MIT, or ISC. | | `license-check-allowed-additional` | false | string | | Provide a semicolon separated list of SPDX-license identifiers that you want to additionally allow. | | `lint` | false | boolean | `false` | Set to `true` to run the `lint` script in a repository's `package.json`. | -| `node-versions` | false | string | `'["18", "20", "21"]'` | Provide a stringified JSON array that specifies the Node.js versions on which the job should run. | +| `node-versions` | false | string | `'["18", "20", "21"]'` | Provide A JSON array that specifies the Node.js versions on which the job should run. | ## Benchmark PR workflow @@ -112,7 +112,7 @@ jobs: | Input Name | Required | Type | Default | Description | | ---------------------------------- | ---------- | ------- | ----------- | ---------------------------------------------------------------------------------- | | `npm-script` | false | string | `benchmark` | Provide the name of the npm script to run | -| `node-versions` | false | string | `'["18", "20", "21"]'` | Provide a stringified JSON array that specifies the Node.js versions on which the job should run. | +| `node-versions` | false | string | `'["18", "20", "21"]'` | Provide A JSON array that specifies the Node.js versions on which the job should run. | ## Acknowledgements From 815aca9f00ba4da2502550b5adb1afc18752fc5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCrg=C3=BCn=20Day=C4=B1o=C4=9Flu?= Date: Mon, 22 Apr 2024 17:58:13 +0200 Subject: [PATCH 10/10] don't add matrix is to benchmark --- .github/workflows/plugins-benchmark-pr.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/plugins-benchmark-pr.yml b/.github/workflows/plugins-benchmark-pr.yml index f1be030..bb948d5 100644 --- a/.github/workflows/plugins-benchmark-pr.yml +++ b/.github/workflows/plugins-benchmark-pr.yml @@ -40,7 +40,7 @@ on: jobs: benchmark: if: ${{ github.event.label.name == 'benchmark' }} - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest permissions: contents: read outputs: @@ -54,7 +54,6 @@ jobs: strategy: matrix: node-version: ${{ fromJson(inputs.node-versions) }} - os: [ubuntu-latest] steps: - name: Checkout ${{ inputs.pr-repo }}@${{ inputs.pr-ref }} uses: actions/checkout@v4