diff --git a/.circleci/config.yml b/.circleci/config.yml index 4d0d404bf7fb..40d550024273 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -128,7 +128,7 @@ jobs: command: .circleci/scripts/release-bump-manifest-version.sh - run: name: Update changelog - command: yarn update-changelog + command: yarn update-changelog --rc - run: name: Commit changes command: .circleci/scripts/release-commit-version-bump.sh diff --git a/development/auto-changelog.js b/development/auto-changelog.js index ca69a87479c2..88434a7d39ca 100755 --- a/development/auto-changelog.js +++ b/development/auto-changelog.js @@ -9,6 +9,17 @@ const runCommand = require('./lib/runCommand'); const URL = '/~https://github.com/MetaMask/metamask-extension'; async function main() { + const args = process.argv.slice(2); + let isReleaseCandidate = false; + + for (const arg of args) { + if (arg === '--rc') { + isReleaseCandidate = true; + } else { + throw new Error(`Unrecognized argument: ${arg}`); + } + } + await runCommand('git', ['fetch', '--tags']); const [mostRecentTagCommitHash] = await runCommand('git', [ @@ -100,10 +111,6 @@ async function main() { return; } - // remove the "v" prefix - const mostRecentVersion = mostRecentTag.slice(1); - - const isReleaseCandidate = mostRecentVersion !== version; const versionHeader = `## [${version}]`; const escapedVersionHeader = escapeRegExp(versionHeader); const currentDevelopBranchHeader = '## [Unreleased]';