Commit 071047e4 authored by Daniel Dehennin's avatar Daniel Dehennin
Browse files

ci(release): avoid regression in `dev` branch

Any fixes applied to the `testing` branch should be integrated to the
`dev` branch when the release is done.

The `package*.json` files have their `version` updated by
`semantic-release/npm`, when a new release is produced, we need to
propagate to `dev` too.
parent a75a55ce
Pipeline #15424 passed with stages
in 1 minute and 52 seconds
......@@ -64,7 +64,8 @@ build-docker:
###############################################################################
# `release` stage: `semantic-release`, `testing-prerelease`, `tag *`
# `release` stage: `semantic-release`, `testing-prerelease`,
# `tag *`, `merge-to-dev`
###############################################################################
# Create the release versions on `$STABLE_BRANCH`
new-release: {extends: '.semantic-release:stable'}
......@@ -73,6 +74,9 @@ new-release: {extends: '.semantic-release:stable'}
# update `.releaserc.js` variable `betaBranch`
testing-prerelease: {extends: '.semantic-release:testing'}
# Avoid regression by merging all pre-release fixes to `$DEV_BRANCH`
merge-to-dev: {extends: '.git:merge-to', variables: {GIT_MERGE_TARGET: $DEV_BRANCH}}
## tag contribution branches with a more stable name than `git-${CI_COMMIT_SHORT_SHA}`
tag contrib branch:
extends:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment