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() {
28
28
console . log ( `Running on branch: ${ branch } ` ) ;
29
29
30
30
// Set changelog file
31
- const changelogFile = `./changelogs/CHANGELOG_release .md` ;
31
+ const changelogFile = `./changelogs/CHANGELOG_ ${ branch } .md` ;
32
32
console . log ( `Changelog file output to: ${ changelogFile } ` ) ;
33
33
34
34
// Load template file contents
35
35
await loadTemplates ( ) ;
36
36
37
37
const config = {
38
38
branches : [
39
- 'release' ,
39
+ 'release(-[0-9]+\.x\.x)? ' ,
40
40
{ name : 'alpha' , prerelease : true } ,
41
41
{ name : 'beta' , prerelease : true } ,
42
42
'next-major' ,
43
- // Long-Term-Support branches
44
- { name : 'release-5.x.x' , range : '5.x.x' , channel : '5.x.x' } ,
45
43
] ,
46
44
dryRun : false ,
47
45
debug : true ,
@@ -85,6 +83,16 @@ async function config() {
85
83
labels : [ 'type:ci' ] ,
86
84
releasedLabels : [ 'state:released<%= nextRelease.channel ? `-\${nextRelease.channel}` : "" %>' ]
87
85
} ] ,
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
+ ] ,
88
96
] ,
89
97
} ;
90
98
You can’t perform that action at this time.
0 commit comments