You've already forked matrix-js-sdk
mirror of
https://github.com/matrix-org/matrix-js-sdk.git
synced 2025-12-19 10:22:30 +03:00
Merge pull request #272 from matrix-org/dbkr/release_script_fixes
More fixes to the release script
This commit is contained in:
13
release.sh
13
release.sh
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
#
|
#
|
||||||
# Script to perform a release of matrix-js-sdk. Performs the steps documented
|
# Script to perform a release of matrix-js-sdk. Performs the steps documented
|
||||||
# in RELEASING.md
|
# in RELEASING.md
|
||||||
@@ -60,7 +60,8 @@ if [ $# -ne 1 ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$skip_changelog" ]; then
|
if [ -z "$skip_changelog" ]; then
|
||||||
update_changelog --version > /dev/null || echo "github-changelog-generator is required: please install it"; exit
|
# update_changelog doesn't have a --version flag
|
||||||
|
update_changelog -h > /dev/null || (echo "github-changelog-generator is required: please install it"; exit)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# ignore leading v on release
|
# ignore leading v on release
|
||||||
@@ -88,9 +89,15 @@ if [ -z "$skip_changelog" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# we might already be on the release branch, in which case, yay
|
# we might already be on the release branch, in which case, yay
|
||||||
if [ $(git symbolic-ref --short HEAD) != "$rel_branch" ]; then
|
# If we're on any branch starting with 'release', we don't create
|
||||||
|
# a separate release branch (this allows us to use the same
|
||||||
|
# release branch for releases and release candidates).
|
||||||
|
curbranch=$(git symbolic-ref --short HEAD)
|
||||||
|
if [[ "$curbranch" != release* ]]; then
|
||||||
echo "Creating release branch"
|
echo "Creating release branch"
|
||||||
git checkout -b "$rel_branch"
|
git checkout -b "$rel_branch"
|
||||||
|
else
|
||||||
|
echo "Using current branch ($curbranch) for release"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$skip_changelog" ]; then
|
if [ -z "$skip_changelog" ]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user