diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index baa90d4fb..7f43132e2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,8 +62,4 @@ jobs: GIT_COMMITTER_NAME: ${{ steps.import_gpg.outputs.name }} run: | npm install - if [[ "${{ inputs.release_candidate }}" == "true" ]]; then - npx semantic-release -e ./release-dev.config.js - else - npx semantic-release -e ./release-prod.config.js - fi + npx semantic-release -e ./release.config.js diff --git a/release-dev.config.js b/release-dev.config.js deleted file mode 100644 index 59ffbe948..000000000 --- a/release-dev.config.js +++ /dev/null @@ -1,10 +0,0 @@ -const baseConfig = require('./release.base.config'); -module.exports = baseConfig({ - branches: [ - 'main', - { - name: 'release/*', - prerelease: 'rc' - } - ], -}); diff --git a/release-prod.config.js b/release-prod.config.js deleted file mode 100644 index d2b9b5f92..000000000 --- a/release-prod.config.js +++ /dev/null @@ -1,9 +0,0 @@ -const baseConfig = require('./release.base.config'); -module.exports = baseConfig({ - branches: [ - 'main', - { - name: 'release/*', - } - ], -}); diff --git a/release.base.config.js b/release.base.config.js deleted file mode 100644 index 4d4445077..000000000 --- a/release.base.config.js +++ /dev/null @@ -1,35 +0,0 @@ -module.exports = (extraConfig = {}) => ( - { - ...extraConfig, - plugins: [ - '@semantic-release/commit-analyzer', - '@semantic-release/release-notes-generator', - ['@semantic-release/changelog', { changelogFile: 'CHANGELOG.md' }], - ['@semantic-release/exec', { "prepareCmd": './publish.sh ${nextRelease.version}' }], - [ - '@semantic-release/git', - { - assets: [ - 'package.json', - 'package-lock.json', - 'CHANGELOG.md', - 'docs/**/*', - ], - message: 'chore(release): release ${nextRelease.version}\n\n${nextRelease.notes}', - }, - ], - // [ - // 'semantic-release-slack-bot', - // { - // notifyOnSuccess: true, - // notifyOnFail: true, - // markdownReleaseNotes: true, - // onSuccessTemplate: { - // text: - // "A new version of `$package_name` successfully released!\nVersion: `$npm_package_version`\nTag: $repo_url/releases/tag/v$npm_package_version\n\nRelease notes:\n$release_notes", - // }, - // }, - // ], - ], - } -); diff --git a/release.config.js b/release.config.js new file mode 100644 index 000000000..79b94acb1 --- /dev/null +++ b/release.config.js @@ -0,0 +1,40 @@ +module.exports = { + branches: [ + 'main', + 'release/*', + { + name: 'rc', + prerelease: true + } + ], + plugins: [ + '@semantic-release/commit-analyzer', + '@semantic-release/release-notes-generator', + ['@semantic-release/changelog', { changelogFile: 'CHANGELOG.md' }], + ['@semantic-release/exec', { "prepareCmd": './publish.sh ${nextRelease.version}' }], + [ + '@semantic-release/git', + { + assets: [ + 'package.json', + 'package-lock.json', + 'CHANGELOG.md', + 'docs/**/*', + ], + message: 'chore(release): release ${nextRelease.version}\n\n${nextRelease.notes}', + }, + ], + // [ + // 'semantic-release-slack-bot', + // { + // notifyOnSuccess: true, + // notifyOnFail: true, + // markdownReleaseNotes: true, + // onSuccessTemplate: { + // text: + // "A new version of `$package_name` successfully released!\nVersion: `$npm_package_version`\nTag: $repo_url/releases/tag/v$npm_package_version\n\nRelease notes:\n$release_notes", + // }, + // }, + // ], + ], +};