gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reset SDK deps back to develop after a release 

This automates the (frequently forgotten) step of resetting SDK deps back to the
develop branch after merging the release to develop.
This commit is contained in:
J. Ryan Stinnett 2020-02-14 12:21:54 +00:00
parent a26bd6ef94
commit 585d40f4c1
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
release.sh
View File

@ -44,11 +44,17 @@ do
fi fi
done done
# bump Electron's package.json first
release="${1#v}" release="${1#v}"
tag="v${release}" tag="v${release}"
echo "electron yarn version" prerelease=0
# We check if this build is a prerelease by looking to
# see if the version has a hyphen in it. Crude,
# but semver doesn't support postreleases so anything
# with a hyphen is a prerelease.
echo $release | grep -q '-' && prerelease=1
# bump Electron's package.json first
echo "electron yarn version"
cd electron_app cd electron_app
yarn version --no-git-tag-version --new-version "$release" yarn version --no-git-tag-version --new-version "$release"
git commit package.json -m "$tag" git commit package.json -m "$tag"
@ -56,3 +62,16 @@ git commit package.json -m "$tag"
cd .. cd ..
exec ./node_modules/matrix-js-sdk/release.sh -u vector-im -z "$orig_args" exec ./node_modules/matrix-js-sdk/release.sh -u vector-im -z "$orig_args"
if [ $prerelease -eq 0 ]
then
# For a release, reset SDK deps back to the `develop` branch.
for i in matrix-js-sdk matrix-react-sdk
do
echo "Resetting $i to develop branch..."
yarn add github:matrix-org/$i#develop
git add -u
git commit -m "Reset $i back to develop branch"
done
git push origin develop
fi