From 87bec1051b9706b4ae1efbd92e4d974c01d98c51 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 25 Jul 2018 17:05:15 +0200 Subject: Handle pre releases in release script --- scripts/release.sh | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/scripts/release.sh b/scripts/release.sh index 9adfe2b5d..b5fa68f42 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -31,6 +31,12 @@ if [ "$branch" != "develop" ]; then fi version="v$1" +github_prerelease_option="" +if [[ "$version" = *".pre."* ]]; then + echo "This is a pre-release." + github_prerelease_option="--pre-release" +fi + directory_name="peertube-$version" zip_name="peertube-$version.zip" tar_name="peertube-$version.tar.xz" @@ -90,7 +96,7 @@ rm "./client/dist/embed-stats.json" ( git push origin --tag - github-release release --user chocobozzz --repo peertube --tag "$version" --name "$version" --description "$changelog" + github-release release --user chocobozzz --repo peertube --tag "$version" --name "$version" --description "$changelog" "$github_prerelease_option" github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$zip_name" --file "$zip_name" github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$zip_name.asc" --file "$zip_name.asc" github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$tar_name" --file "$tar_name" @@ -98,9 +104,12 @@ rm "./client/dist/embed-stats.json" git push origin develop - # Update master branch - git checkout master - git rebase develop - git push origin master - git checkout develop + # Only update master if it is not a pre release + if [ -z "$github_prerelease_option" ]; then + # Update master branch + git checkout master + git rebase develop + git push origin master + git checkout develop + fi ) -- cgit v1.2.3