Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: add backmerge branches #2067

Merged
merged 24 commits into from
Mar 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
174ea3e
ci: bump environment
mtrezza Feb 8, 2022
fdf5eb2
bump node
mtrezza Feb 9, 2022
7bfdad4
ci: bump environment (#2034)
mtrezza Feb 9, 2022
f80bd07
fix: adding internal class (e.g. `_User`) fails due to prefixed under…
KodeDave Feb 10, 2022
13b1759
chore(release): 4.0.0-alpha.16 [skip ci]
semantic-release-bot Feb 10, 2022
1798179
refactor: bump follow-redirects from 1.14.7 to 1.14.8 (#2039)
dependabot[bot] Feb 12, 2022
a0720a6
refactor: upgrade typescript from 4.5.4 to 4.5.5 (#2038)
snyk-bot Feb 12, 2022
9ddc98d
refactor: bump node-sass from 6.0.1 to 7.0.0 (#2037)
dependabot[bot] Feb 12, 2022
3a3e5e7
refactor: upgrade otpauth from 7.0.9 to 7.0.10 (#2044)
snyk-bot Feb 17, 2022
57c4870
refactor: upgrade graphql from 16.2.0 to 16.3.0 (#2043)
snyk-bot Feb 17, 2022
3afb24e
fix: security upgrade prismjs from 1.26.0 to 1.27.0 (#2047)
snyk-bot Feb 23, 2022
cb70cba
chore(release): 4.0.0-alpha.17 [skip ci]
semantic-release-bot Feb 23, 2022
0e819c6
refactor: upgrade @babel/runtime from 7.16.7 to 7.17.0 (#2048)
snyk-bot Feb 24, 2022
93335e9
fix: upgrade @babel/runtime from 7.17.0 to 7.17.2 (#2055)
snyk-bot Mar 2, 2022
23ed93d
chore(release): 4.0.0-alpha.18 [skip ci]
semantic-release-bot Mar 2, 2022
a6f7a3b
refactor: upgrade body-parser from 1.19.1 to 1.19.2 (#2057)
snyk-bot Mar 10, 2022
f8dc602
fix: upgrade express from 4.17.2 to 4.17.3 (#2058)
snyk-bot Mar 10, 2022
c55d3d1
chore(release): 4.0.0-alpha.19 [skip ci]
semantic-release-bot Mar 10, 2022
bb1e184
feat: change string filter description (#2059)
cyb3rko Mar 16, 2022
d43a54e
chore(release): 4.0.0-alpha.20 [skip ci]
semantic-release-bot Mar 16, 2022
c379306
fix: upgrade otpauth from 7.0.10 to 7.0.11 (#2061)
snyk-bot Mar 18, 2022
12b61b7
chore(release): 4.0.0-alpha.21 [skip ci]
semantic-release-bot Mar 18, 2022
754a989
add backmerge
mtrezza Mar 23, 2022
9f9b85d
Merge branch 'alpha' into ci-add-backmerge
mtrezza Mar 23, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release-automated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- run: npx semantic-release
env:
GH_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Determine tag on current commit
id: tag
Expand Down
45 changes: 45 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
"@babel/plugin-transform-runtime": "7.16.4",
"@babel/preset-env": "7.16.4",
"@babel/preset-react": "7.16.0",
"@saithodev/semantic-release-backmerge": "2.1.2",
"@semantic-release/changelog": "5.0.1",
"@semantic-release/commit-analyzer": "8.0.1",
"@semantic-release/git": "9.0.0",
Expand Down
10 changes: 10 additions & 0 deletions release.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,16 @@ async function config() {
['@semantic-release/git', {
assets: [changelogFile, 'package.json', 'package-lock.json', 'npm-shrinkwrap.json'],
}],
[
'@saithodev/semantic-release-backmerge',
{
'branches': [
{ from: 'beta', to: 'alpha' },
{ from: 'release', to: 'beta' },
{ from: 'release', to: 'alpha' },
]
}
],
['@semantic-release/github', {
successComment: getReleaseComment(),
labels: ['type:ci'],
Expand Down