Skip to content

Commit

Permalink
Change release branch naming in release procedure and script (#1132)
Browse files Browse the repository at this point in the history
  • Loading branch information
msimberg committed May 10, 2024
1 parent 5228e5c commit ee57bfa
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion RELEASE_PROCEDURE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ DLA-Future follows [Semantic Versioning](https://semver.org).

1. For minor and major releases: check out the `master` branch. All changes required for the release are
added to `master` via pull requests. For patch releases: check out the corresponding
`release-major.minor` branch.
`version_major.minor` branch.

1. Write release notes in `CHANGELOG.md`. Check for issues and pull requests for the release on the
[DLA-F Planning board](https://github.com/orgs/eth-cscs/projects/1). Make sure to include changes that
Expand Down
4 changes: 2 additions & 2 deletions scripts/roll_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ if ! which hub >/dev/null 2>&1; then
fi

# Major and minor releases are made directly from master. Patch releases are branched out from the major
# and minor releases with a release-X.Y branch.
# and minor releases with a version_X.Y branch.
if [[ "${VERSION_PATCH}" -eq 0 ]]; then
RELEASE_BRANCH="master"
else
RELEASE_BRANCH="release-${VERSION_MAJOR}.${VERSION_MINOR}"
RELEASE_BRANCH="version_${VERSION_MAJOR}.${VERSION_MINOR}"
fi

if ! [[ "$CURRENT_BRANCH" == "$RELEASE_BRANCH" ]]; then
Expand Down

0 comments on commit ee57bfa

Please sign in to comment.