Skip to content

Commit 2830021

Browse files
authored
build: release
2 parents 01096b3 + d2d12d3 commit 2830021

File tree

5 files changed

+88
-1
lines changed

5 files changed

+88
-1
lines changed

.github/workflows/release-automated.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- run: npx semantic-release
3131
env:
3232
GH_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
33-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33+
GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
3434
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
3535
- name: Determine tag on current commit
3636
id: tag

CONTRIBUTING.md

+16
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,22 @@ If the commit reverts a previous commit, use the prefix `revert:`, followed by t
363363
This reverts commit 1234567890abcdef.
364364
```
365365
366+
⚠️ A `revert` prefix will *always* trigger a release. Generally, a commit that did not trigger a release when it was initially merged should also not trigger a release when it is reverted. For example, do not use the `revert` prefix when reverting a commit that has a `ci` prefix:
367+
368+
```
369+
ci: add something
370+
```
371+
is reverted with:
372+
```
373+
ci: remove something
374+
```
375+
instead of:
376+
```
377+
revert: ci: add something
378+
379+
This reverts commit 1234567890abcdef.
380+
```
381+
366382
### Major Release / Long-Term-Support
367383
368384
Long-Term-Support (LTS) is provided for the previous Parse Server major version. For example, Parse Server 4.x will receive security updates until Parse Server 5.x is superseded by Parse Server 6.x and becomes the new LTS version. While the current major version is published on branch `release`, a LTS version is published on branch `release-#.x.x`, for example `release-4.x.x` for the Parse Server 4.x LTS branch.

package-lock.json

+60
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
@@ -69,6 +69,7 @@
6969
"@babel/plugin-transform-flow-strip-types": "7.9.0",
7070
"@babel/preset-env": "7.10.0",
7171
"@parse/minami": "1.0.0",
72+
"@saithodev/semantic-release-backmerge": "2.1.2",
7273
"@semantic-release/changelog": "5.0.1",
7374
"@semantic-release/commit-analyzer": "8.0.1",
7475
"@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)