From ae18994d6f592657f1b88b0fb8ea14f1f639e1bd Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Wed, 11 Oct 2023 18:07:51 +0100 Subject: [PATCH 1/2] fix: check all dependency licenses --- .github/workflows/plugins-ci-mongo.yml | 2 +- .github/workflows/plugins-ci-mysql.yml | 2 +- .github/workflows/plugins-ci-postgres.yml | 2 +- .github/workflows/plugins-ci-redis.yml | 2 +- .github/workflows/plugins-ci.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/plugins-ci-mongo.yml b/.github/workflows/plugins-ci-mongo.yml index 21c7982..4124d39 100644 --- a/.github/workflows/plugins-ci-mongo.yml +++ b/.github/workflows/plugins-ci-mongo.yml @@ -63,7 +63,7 @@ jobs: run: npm i --ignore-scripts - name: Check Licenses - run: ${{ format('npx license-checker --production --summary --onlyAllow="0BSD;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;MIT;{0}"', inputs.license-check-allowed-additional) }} + run: ${{ format('npx license-checker --summary --onlyAllow="0BSD;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;MIT;{0}"', inputs.license-check-allowed-additional) }} linter: name: Lint Code diff --git a/.github/workflows/plugins-ci-mysql.yml b/.github/workflows/plugins-ci-mysql.yml index d90c0a1..3d38c88 100644 --- a/.github/workflows/plugins-ci-mysql.yml +++ b/.github/workflows/plugins-ci-mysql.yml @@ -63,7 +63,7 @@ jobs: run: npm i --ignore-scripts - name: Check Licenses - run: ${{ format('npx license-checker --production --summary --onlyAllow="0BSD;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;MIT;{0}"', inputs.license-check-allowed-additional) }} + run: ${{ format('npx license-checker --summary --onlyAllow="0BSD;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;MIT;{0}"', inputs.license-check-allowed-additional) }} linter: name: Lint Code diff --git a/.github/workflows/plugins-ci-postgres.yml b/.github/workflows/plugins-ci-postgres.yml index 7e8fe5f..06c607a 100644 --- a/.github/workflows/plugins-ci-postgres.yml +++ b/.github/workflows/plugins-ci-postgres.yml @@ -63,7 +63,7 @@ jobs: run: npm i --ignore-scripts - name: Check Licenses - run: ${{ format('npx license-checker --production --summary --onlyAllow="0BSD;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;MIT;{0}"', inputs.license-check-allowed-additional) }} + run: ${{ format('npx license-checker --summary --onlyAllow="0BSD;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;MIT;{0}"', inputs.license-check-allowed-additional) }} linter: name: Lint Code diff --git a/.github/workflows/plugins-ci-redis.yml b/.github/workflows/plugins-ci-redis.yml index 8f2b494..7abc0b7 100644 --- a/.github/workflows/plugins-ci-redis.yml +++ b/.github/workflows/plugins-ci-redis.yml @@ -63,7 +63,7 @@ jobs: run: npm i --ignore-scripts - name: Check Licenses - run: ${{ format('npx license-checker --production --summary --onlyAllow="0BSD;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;MIT;{0}"', inputs.license-check-allowed-additional) }} + run: ${{ format('npx license-checker --summary --onlyAllow="0BSD;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;MIT;{0}"', inputs.license-check-allowed-additional) }} linter: name: Lint Code diff --git a/.github/workflows/plugins-ci.yml b/.github/workflows/plugins-ci.yml index 921fda4..92ade52 100644 --- a/.github/workflows/plugins-ci.yml +++ b/.github/workflows/plugins-ci.yml @@ -63,7 +63,7 @@ jobs: run: npm i --ignore-scripts - name: Check Licenses - run: ${{ format('npx license-checker --production --summary --onlyAllow="0BSD;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;MIT;{0}"', inputs.license-check-allowed-additional) }} + run: ${{ format('npx license-checker --summary --onlyAllow="0BSD;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;MIT;{0}"', inputs.license-check-allowed-additional) }} linter: name: Lint Code From c721cb33a8bb778e3b50634588cad7d0bbaaf1fa Mon Sep 17 00:00:00 2001 From: Frazer Smith Date: Wed, 11 Oct 2023 18:09:19 +0100 Subject: [PATCH 2/2] docs: remove explicit mention of production deps --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0a9b9df..783e840 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ 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` | false | boolean | `false` | Set to `true` to check that a repository's 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`. |