From 68e926f6039801d30c5b29ea1c07f393772bbf82 Mon Sep 17 00:00:00 2001 From: Celio Ferreira Date: Thu, 12 May 2022 10:15:22 +0200 Subject: [PATCH 1/5] chore: add catalog-info.yml --- catalog-info.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 catalog-info.yml diff --git a/catalog-info.yml b/catalog-info.yml new file mode 100644 index 00000000..70941b5c --- /dev/null +++ b/catalog-info.yml @@ -0,0 +1,16 @@ +apiVersion: backstage.io/v1alpha1 +kind: Component +metadata: + name: commitlint-github-action + description: | + Lints Pull Request commits with commitlint. + annotations: + github.com/project-slug: Tradeshift/commitlint-github-action + tags: + - github-action + - nodejs + - fork +spec: + type: library + owner: developer-productivity + lifecycle: production From 39d2f0ea9b0d0807689295f845b592b0ee7f073e Mon Sep 17 00:00:00 2001 From: Jesper Terkelsen Date: Fri, 24 Jun 2022 13:09:07 +0200 Subject: [PATCH 2/5] chore: add Repofile --- Repofile | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Repofile diff --git a/Repofile b/Repofile new file mode 100644 index 00000000..89f0b9ee --- /dev/null +++ b/Repofile @@ -0,0 +1,8 @@ +{ + "maintainers": [ + "Developer productivity" + ], + "checks": [ + "commitlint" + ] +} From 939d587511a6e7097d35a9ab871b6862b487532a Mon Sep 17 00:00:00 2001 From: Jesper Terkelsen Date: Fri, 24 Jun 2022 12:36:54 +0200 Subject: [PATCH 3/5] chore: setup rebase automation Motivation: we want to get upstream changes automatically because they usually fix vulnerabilities --- .github/workflows/rebase.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/rebase.yml diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml new file mode 100644 index 00000000..ec3b99c9 --- /dev/null +++ b/.github/workflows/rebase.yml @@ -0,0 +1,19 @@ +# .github/workflows/sync.yml +name: Rebase Upstream +on: + schedule: + - cron: "0 0 * * 0" # run once a week + workflow_dispatch: # run manually + +jobs: + sync: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + with: + fetch-depth: 0 # fetching all history so i can rebase + token: ${{ secrets.GH_TOKEN }} + - uses: tradeshift/rebase-upstream-action@master + # with: # all args are optional + # upstream: / + # branch: master From 75b3a17159554c5240c1ffa9a2ec249c795f1485 Mon Sep 17 00:00:00 2001 From: Jesper Terkelsen Date: Mon, 27 Jun 2022 13:09:42 +0200 Subject: [PATCH 4/5] chore: setup commit signing when rebasing --- .github/workflows/rebase.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index ec3b99c9..90b60598 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -13,6 +13,10 @@ jobs: with: fetch-depth: 0 # fetching all history so i can rebase token: ${{ secrets.GH_TOKEN }} + - name: Configure git for tradeshiftci + uses: tradeshift/actions-git/configure-from-gpg-key@v1 + with: + gpg-key: ${{ secrets.TRADESHIFTCI_GPG_KEY }} - uses: tradeshift/rebase-upstream-action@master # with: # all args are optional # upstream: / From 21f6105f9b2ee40b5cbf9356d2de20c98b2dc1be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 19 Feb 2023 00:10:45 +0000 Subject: [PATCH 5/5] chore(deps): bump conventional-changelog-conventionalcommits Bumps [conventional-changelog-conventionalcommits](https://github.com/conventional-changelog/conventional-changelog) from 4.6.3 to 5.0.0. - [Release notes](https://github.com/conventional-changelog/conventional-changelog/releases) - [Changelog](https://github.com/conventional-changelog/conventional-changelog/blob/master/.release-please-manifest.json) - [Commits](https://github.com/conventional-changelog/conventional-changelog/compare/conventional-changelog-conventionalcommits-v4.6.3...conventional-changelog-conventionalcommits-v5.0.0) --- updated-dependencies: - dependency-name: conventional-changelog-conventionalcommits dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 91 ++++++++++++++++++----------------------------- package.json | 2 +- 2 files changed, 35 insertions(+), 58 deletions(-) diff --git a/package-lock.json b/package-lock.json index ce12a9fa..e51bdeaf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "commitlint-config-jira": "^1.6.4", "commitlint-plugin-function-rules": "^1.7.1", "commitlint-plugin-jira-rules": "^1.6.4", - "conventional-changelog-conventionalcommits": "^4.6.3", + "conventional-changelog-conventionalcommits": "^5.0.0", "conventional-changelog-lint-config-canonical": "^1.0.0", "dargs": "^8.1.0", "execa": "^5.1.1", @@ -1909,19 +1909,6 @@ "node": ">=v14" } }, - "node_modules/@commitlint/config-conventional/node_modules/conventional-changelog-conventionalcommits": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-5.0.0.tgz", - "integrity": "sha512-lCDbA+ZqVFQGUj7h9QBKoIpLhl8iihkO0nCTyRNzuXtcd7ubODpYB04IFy31JloiJgG0Uovu8ot8oxRzn7Nwtw==", - "dependencies": { - "compare-func": "^2.0.0", - "lodash": "^4.17.15", - "q": "^1.5.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@commitlint/config-lerna-scopes": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/@commitlint/config-lerna-scopes/-/config-lerna-scopes-17.0.2.tgz", @@ -5909,20 +5896,6 @@ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", "dev": true }, - "node_modules/commit-and-tag-version/node_modules/conventional-changelog-conventionalcommits": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-5.0.0.tgz", - "integrity": "sha512-lCDbA+ZqVFQGUj7h9QBKoIpLhl8iihkO0nCTyRNzuXtcd7ubODpYB04IFy31JloiJgG0Uovu8ot8oxRzn7Nwtw==", - "dev": true, - "dependencies": { - "compare-func": "^2.0.0", - "lodash": "^4.17.15", - "q": "^1.5.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/commit-and-tag-version/node_modules/escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -6161,9 +6134,9 @@ "dev": true }, "node_modules/conventional-changelog-conventionalcommits": { - "version": "4.6.3", - "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.3.tgz", - "integrity": "sha512-LTTQV4fwOM4oLPad317V/QNQ1FY4Hju5qeBIM1uTHbrnCE+Eg4CdRZ3gO2pUeR+tzWdp80M2j3qFFEDWVqOV4g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-5.0.0.tgz", + "integrity": "sha512-lCDbA+ZqVFQGUj7h9QBKoIpLhl8iihkO0nCTyRNzuXtcd7ubODpYB04IFy31JloiJgG0Uovu8ot8oxRzn7Nwtw==", "dependencies": { "compare-func": "^2.0.0", "lodash": "^4.17.15", @@ -6301,6 +6274,20 @@ "semver": "bin/semver.js" } }, + "node_modules/conventional-changelog/node_modules/conventional-changelog-conventionalcommits": { + "version": "4.6.3", + "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.3.tgz", + "integrity": "sha512-LTTQV4fwOM4oLPad317V/QNQ1FY4Hju5qeBIM1uTHbrnCE+Eg4CdRZ3gO2pUeR+tzWdp80M2j3qFFEDWVqOV4g==", + "dev": true, + "dependencies": { + "compare-func": "^2.0.0", + "lodash": "^4.17.15", + "q": "^1.5.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/conventional-commits-filter": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz", @@ -16594,18 +16581,6 @@ "integrity": "sha512-WU2p0c9/jLi8k2q2YrDV96Y8XVswQOceIQ/wyJvQxawJSCasLdRB3kUIYdNjOCJsxkpoUlV/b90ZPxp1MYZDiA==", "requires": { "conventional-changelog-conventionalcommits": "^5.0.0" - }, - "dependencies": { - "conventional-changelog-conventionalcommits": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-5.0.0.tgz", - "integrity": "sha512-lCDbA+ZqVFQGUj7h9QBKoIpLhl8iihkO0nCTyRNzuXtcd7ubODpYB04IFy31JloiJgG0Uovu8ot8oxRzn7Nwtw==", - "requires": { - "compare-func": "^2.0.0", - "lodash": "^4.17.15", - "q": "^1.5.1" - } - } } }, "@commitlint/config-lerna-scopes": { @@ -19742,17 +19717,6 @@ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", "dev": true }, - "conventional-changelog-conventionalcommits": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-5.0.0.tgz", - "integrity": "sha512-lCDbA+ZqVFQGUj7h9QBKoIpLhl8iihkO0nCTyRNzuXtcd7ubODpYB04IFy31JloiJgG0Uovu8ot8oxRzn7Nwtw==", - "dev": true, - "requires": { - "compare-func": "^2.0.0", - "lodash": "^4.17.15", - "q": "^1.5.1" - } - }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -19898,6 +19862,19 @@ "conventional-changelog-jquery": "^3.0.11", "conventional-changelog-jshint": "^2.0.9", "conventional-changelog-preset-loader": "^2.3.4" + }, + "dependencies": { + "conventional-changelog-conventionalcommits": { + "version": "4.6.3", + "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.3.tgz", + "integrity": "sha512-LTTQV4fwOM4oLPad317V/QNQ1FY4Hju5qeBIM1uTHbrnCE+Eg4CdRZ3gO2pUeR+tzWdp80M2j3qFFEDWVqOV4g==", + "dev": true, + "requires": { + "compare-func": "^2.0.0", + "lodash": "^4.17.15", + "q": "^1.5.1" + } + } } }, "conventional-changelog-angular": { @@ -19947,9 +19924,9 @@ "dev": true }, "conventional-changelog-conventionalcommits": { - "version": "4.6.3", - "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.3.tgz", - "integrity": "sha512-LTTQV4fwOM4oLPad317V/QNQ1FY4Hju5qeBIM1uTHbrnCE+Eg4CdRZ3gO2pUeR+tzWdp80M2j3qFFEDWVqOV4g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-5.0.0.tgz", + "integrity": "sha512-lCDbA+ZqVFQGUj7h9QBKoIpLhl8iihkO0nCTyRNzuXtcd7ubODpYB04IFy31JloiJgG0Uovu8ot8oxRzn7Nwtw==", "requires": { "compare-func": "^2.0.0", "lodash": "^4.17.15", diff --git a/package.json b/package.json index 6cb54f67..f4be7274 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "commitlint-config-jira": "^1.6.4", "commitlint-plugin-function-rules": "^1.7.1", "commitlint-plugin-jira-rules": "^1.6.4", - "conventional-changelog-conventionalcommits": "^4.6.3", + "conventional-changelog-conventionalcommits": "^5.0.0", "conventional-changelog-lint-config-canonical": "^1.0.0", "dargs": "^8.1.0", "execa": "^5.1.1",