File tree Expand file tree Collapse file tree 1 file changed +12
-4
lines changed Expand file tree Collapse file tree 1 file changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -28,20 +28,18 @@ async function config() {
2828 console . log ( `Running on branch: ${ branch } ` ) ;
2929
3030 // Set changelog file
31- const changelogFile = `./changelogs/CHANGELOG_release .md` ;
31+ const changelogFile = `./changelogs/CHANGELOG_ ${ branch } .md` ;
3232 console . log ( `Changelog file output to: ${ changelogFile } ` ) ;
3333
3434 // Load template file contents
3535 await loadTemplates ( ) ;
3636
3737 const config = {
3838 branches : [
39- 'release' ,
39+ 'release(-[0-9]+\.x\.x)? ' ,
4040 { name : 'alpha' , prerelease : true } ,
4141 { name : 'beta' , prerelease : true } ,
4242 'next-major' ,
43- // Long-Term-Support branches
44- { name : 'release-5.x.x' , range : '5.x.x' , channel : '5.x.x' } ,
4543 ] ,
4644 dryRun : false ,
4745 debug : true ,
@@ -85,6 +83,16 @@ async function config() {
8583 labels : [ 'type:ci' ] ,
8684 releasedLabels : [ 'state:released<%= nextRelease.channel ? `-\${nextRelease.channel}` : "" %>' ]
8785 } ] ,
86+ // Back-merge module runs last because if it fails it should not impede the release process
87+ [
88+ "@saithodev/semantic-release-backmerge" ,
89+ {
90+ "branches" : [
91+ { from : "beta" , to : "alpha" } ,
92+ { from : "release" , to : "beta" } ,
93+ ]
94+ }
95+ ] ,
8896 ] ,
8997 } ;
9098
You can’t perform that action at this time.
0 commit comments