diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml index f77337f..801e7dd 100644 --- a/.github/workflows/release-please.yaml +++ b/.github/workflows/release-please.yaml @@ -60,7 +60,7 @@ jobs: needs: [build] steps: - id: release-pr - uses: GoogleCloudPlatform/release-please-action@v2 + uses: GoogleCloudPlatform/release-please-action@main with: token: ${{ secrets.ACTIONS_BOT_TOKEN }} release-type: node @@ -85,7 +85,7 @@ jobs: runs-on: ubuntu-latest needs: [build] steps: - - uses: GoogleCloudPlatform/release-please-action@v2 + - uses: GoogleCloudPlatform/release-please-action@main id: release with: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 507bbfd..ca78a2e 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,7 @@ Automate releases with Conventional Commit Messages. | `pull-request-title-pattern` | title pattern used to make release PR, defaults to using `chore${scope}: release${component} ${version}`. | | `changelog-path` | configure alternate path for `CHANGELOG.md`. Default `CHANGELOG.md` | | `github-api-url` | configure github API URL. Default `https://api.github.com` | +| `--signoff` | Add [`Signed-off-by`](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---signoff) line at the end of the commit log message using the user and email provided. (format "Name \") | | output | description | |:---:|---| diff --git a/action.yml b/action.yml index 928c2e7..4b526ef 100644 --- a/action.yml +++ b/action.yml @@ -68,6 +68,10 @@ inputs: description: 'where can the manifest file be found in the project?' required: false default: '' + signoff: + description: 'Add [`Signed-off-by`](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---signoff) line at the end of the commit log message using the user and email provided. (format "Name \")' + required: false + default: '' runs: using: 'node12' diff --git a/index.js b/index.js index f0cc564..4c6cd90 100644 --- a/index.js +++ b/index.js @@ -9,6 +9,8 @@ const GITHUB_RELEASE_COMMAND = 'github-release' const GITHUB_RELEASE_PR_COMMAND = 'release-pr' const GITHUB_API_URL = 'https://api.github.com' +const signoff = core.getInput('signoff') || undefined + function getBooleanInput (input) { const trueValue = ['true', 'True', 'TRUE', 'yes', 'Yes', 'YES', 'y', 'Y', 'on', 'On', 'ON'] const falseValue = ['false', 'False', 'FALSE', 'no', 'No', 'NO', 'n', 'N', 'off', 'Off', 'OFF'] @@ -31,7 +33,8 @@ function getGitHubInput () { function getManifestInput () { return { configFile: core.getInput('config-file') || CONFIG_FILE, - manifestFile: core.getInput('manifest-file') || MANIFEST_FILE + manifestFile: core.getInput('manifest-file') || MANIFEST_FILE, + signoff } } @@ -135,7 +138,8 @@ async function main () { changelogSections, versionFile, defaultBranch, - pullRequestTitlePattern + pullRequestTitlePattern, + signoff }) if (pr) { diff --git a/package-lock.json b/package-lock.json index 28401a8..6f04c2d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -232,9 +232,9 @@ } }, "@octokit/auth-token": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.5.tgz", - "integrity": "sha512-BpGYsPgJt05M7/L/5FoE1PiAbdxXFZkX/3kDYcsvd1v6UhlnE5e96dTDr0ezX/EFwciQxf3cNV0loipsURU+WA==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz", + "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==", "requires": { "@octokit/types": "^6.0.3" } @@ -274,16 +274,16 @@ } }, "@octokit/openapi-types": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-10.2.2.tgz", - "integrity": "sha512-EVcXQ+ZrC04cg17AMg1ofocWMxHDn17cB66ZHgYc0eUwjFtxS0oBzkyw2VqIrHBwVgtfoYrq1WMQfQmMjUwthw==" + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-10.5.0.tgz", + "integrity": "sha512-yt8GpYL0s1bLZR7602l0Im5zfmB3UdHYCfcrv3ZGRX95BjX66UQeH4asXjXo8xBit9HneCctVhTMN0On/duukQ==" }, "@octokit/plugin-paginate-rest": { - "version": "2.16.3", - "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.16.3.tgz", - "integrity": "sha512-kdc65UEsqze/9fCISq6BxLzeB9qf0vKvKojIfzgwf4tEF+Wy6c9dXnPFE6vgpoDFB1Z5Jek5WFVU6vL1w22+Iw==", + "version": "2.16.4", + "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.16.4.tgz", + "integrity": "sha512-33UFvlgJP1zQVcbkeMQhzUeEXMOOr1U/3i8GDJqzw9MMRy90P/J+PXfgQvhE0N/rfX01DnY2IQMb2Q/L01EL0A==", "requires": { - "@octokit/types": "^6.28.1" + "@octokit/types": "^6.30.0" } }, "@octokit/plugin-request-log": { @@ -292,11 +292,11 @@ "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==" }, "@octokit/plugin-rest-endpoint-methods": { - "version": "5.10.4", - "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.10.4.tgz", - "integrity": "sha512-Dh+EAMCYR9RUHwQChH94Skl0lM8Fh99auT8ggck/xTzjJrwVzvsd0YH68oRPqp/HxICzmUjLfaQ9sy1o1sfIiA==", + "version": "5.11.1", + "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.11.1.tgz", + "integrity": "sha512-EE69SuO08wtnIy9q/HftGDr7/Im1txzDfeYr+I4T/JkMSNEiedUUE5RuCWkEQAwwbeEU4kVTwSEQZb9Af77/PA==", "requires": { - "@octokit/types": "^6.28.1", + "@octokit/types": "^6.30.0", "deprecation": "^2.3.1" } }, @@ -324,22 +324,22 @@ } }, "@octokit/rest": { - "version": "18.10.0", - "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-18.10.0.tgz", - "integrity": "sha512-esHR5OKy38bccL/sajHqZudZCvmv4yjovMJzyXlphaUo7xykmtOdILGJ3aAm0mFHmMLmPFmDMJXf39cAjNJsrw==", + "version": "18.11.0", + "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-18.11.0.tgz", + "integrity": "sha512-e30+ERbA4nXkzkaCDgfxS9H1A43Z1GvV5nqLfkxS81rYKbFE6+sEsrXsTRzV1aWLsRIQ+B75Vgnyzjw/ioTyVA==", "requires": { "@octokit/core": "^3.5.1", "@octokit/plugin-paginate-rest": "^2.16.0", "@octokit/plugin-request-log": "^1.0.4", - "@octokit/plugin-rest-endpoint-methods": "^5.9.0" + "@octokit/plugin-rest-endpoint-methods": "5.11.1" } }, "@octokit/types": { - "version": "6.28.1", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.28.1.tgz", - "integrity": "sha512-XlxDoQLFO5JnFZgKVQTYTvXRsQFfr/GwDUU108NJ9R5yFPkA2qXhTJjYuul3vE4eLXP40FA2nysOu2zd6boE+w==", + "version": "6.31.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.31.0.tgz", + "integrity": "sha512-xobpvYmMYoFSxZB6jL1TPTMMZkxZIBlY145ZKibBJDKCczP1FrLLougtuVOZywGVZdcYs8oq2Bxb3aMjqIFeiw==", "requires": { - "@octokit/openapi-types": "^10.2.2" + "@octokit/openapi-types": "^10.5.0" } }, "@sinonjs/commons": { @@ -2222,9 +2222,9 @@ } }, "map-obj": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz", - "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==" + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", + "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==" }, "meow": { "version": "8.1.2", @@ -2620,9 +2620,12 @@ } }, "node-fetch": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz", - "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA==" + "version": "2.6.5", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz", + "integrity": "sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ==", + "requires": { + "whatwg-url": "^5.0.0" + } }, "normalize-package-data": { "version": "3.0.3", @@ -2867,9 +2870,9 @@ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" }, "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" }, "path-to-regexp": { "version": "1.8.0", @@ -3218,9 +3221,9 @@ "dev": true }, "release-please": { - "version": "11.24.2", - "resolved": "https://registry.npmjs.org/release-please/-/release-please-11.24.2.tgz", - "integrity": "sha512-lobR4bBmN8dG39TAxvVOORbQZuShy9LAoqthgdUMLDAnPXqFdfxVbNtIgGZB4wza0TEkPshr71RD83Li9fv5sg==", + "version": "12.2.0", + "resolved": "https://registry.npmjs.org/release-please/-/release-please-12.2.0.tgz", + "integrity": "sha512-z2np85plTlrGD6Q3Y3VwJ5lTHYoR6Y0s1NMgcSNoBCQ9iyL+ZbuCvmKKpxfRs397Wd2yWfNSZ2u33zOCKwD9Cw==", "requires": { "@conventional-commits/parser": "^0.4.1", "@iarna/toml": "^2.2.5", @@ -3730,6 +3733,11 @@ "is-number": "^7.0.0" } }, + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" + }, "trim-newlines": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", @@ -3874,6 +3882,20 @@ "builtins": "^1.0.3" } }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" + }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", + "requires": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", diff --git a/package.json b/package.json index 7ddf1ff..73e7220 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "homepage": "https://github.com/bcoe/release-please-action#readme", "dependencies": { "@actions/core": "^1.2.6", - "release-please": "^11.24.2" + "release-please": "^12.2.0" }, "devDependencies": { "@vercel/ncc": "^0.27.0",