Skip to content

Commit 6ece67c

Browse files
authored
ci: add backmerge branches (#2067)
1 parent 7a3e8c7 commit 6ece67c

File tree

4 files changed

+57
-1
lines changed

4 files changed

+57
-1
lines changed

.github/workflows/release-automated.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- run: npx semantic-release
2727
env:
2828
GH_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
29-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
29+
GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
3030
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
3131
- name: Determine tag on current commit
3232
id: tag

package-lock.json

+45
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
"@babel/plugin-transform-runtime": "7.16.4",
8383
"@babel/preset-env": "7.16.4",
8484
"@babel/preset-react": "7.16.0",
85+
"@saithodev/semantic-release-backmerge": "2.1.2",
8586
"@semantic-release/changelog": "5.0.1",
8687
"@semantic-release/commit-analyzer": "8.0.1",
8788
"@semantic-release/git": "9.0.0",

release.config.js

+10
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,16 @@ async function config() {
8383
['@semantic-release/git', {
8484
assets: [changelogFile, 'package.json', 'package-lock.json', 'npm-shrinkwrap.json'],
8585
}],
86+
[
87+
'@saithodev/semantic-release-backmerge',
88+
{
89+
'branches': [
90+
{ from: 'beta', to: 'alpha' },
91+
{ from: 'release', to: 'beta' },
92+
{ from: 'release', to: 'alpha' },
93+
]
94+
}
95+
],
8696
['@semantic-release/github', {
8797
successComment: getReleaseComment(),
8898
labels: ['type:ci'],

0 commit comments

Comments
 (0)