diff --git a/release.config.js b/release.config.js index 67d62c56c6..5c0a0cbb6a 100644 --- a/release.config.js +++ b/release.config.js @@ -24,11 +24,11 @@ const templates = { async function config() { // Get branch - const branch = ref.split('/').pop().split('-')[0]; + const branch = ref.split('/').pop(); console.log(`Running on branch: ${branch}`); // Set changelog file - const changelogFile = `./changelogs/CHANGELOG_${branch}.md`; + const changelogFile = `./changelogs/CHANGELOG_release.md`; console.log(`Changelog file output to: ${changelogFile}`); // Load template file contents @@ -40,8 +40,8 @@ async function config() { { name: 'alpha', prerelease: true }, { name: 'beta', prerelease: true }, 'next-major', - // Long-Term-Support branch of previous major version - 'release-6.x.x', + // Long-Term-Support branches + { name: 'release-6.x.x', range: '6.x.x', channel: '6.x.x' }, ], dryRun: false, debug: true, @@ -85,16 +85,6 @@ async function config() { labels: ['type:ci'], releasedLabels: ['state:released<%= nextRelease.channel ? `-\${nextRelease.channel}` : "" %>'] }], - // Back-merge module runs last because if it fails it should not impede the release process - [ - "@saithodev/semantic-release-backmerge", - { - "branches": [ - { from: "beta", to: "alpha" }, - { from: "release", to: "beta" }, - ] - } - ], ], };