X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Frelease.sh;h=4b45c959d521a17d9c681b472bfdd782ca1dc9b8;hb=3d52b300ea79bec21f090e2447c4808307078618;hp=393955264b2155ecbc745fcec88c08da47d3fd10;hpb=989e526abf0c0dd7958deb630df009608561bb67;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/release.sh b/scripts/release.sh
index 393955264..4b45c959d 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -25,12 +25,18 @@ if [ -z "$GITHUB_TOKEN" ]; then
 fi
 
 branch=$(git symbolic-ref --short -q HEAD)
-if [ "$branch" != "develop" ]; then
-  echo "Need to be on develop branch."
+if [ "$branch" != "develop" ] && [[ "$branch" != feature/* ]]; then
+  echo "Need to be on develop or release branch."
   exit -1
 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"
@@ -57,7 +63,8 @@ git commit package.json client/package.json -m "Bumped to version $version"
 git tag -s -a "$version" -m "$version"
 
 npm run build
-rm "./client/dist/en-US/stats.json"
+rm "./client/dist/en_US/stats.json"
+rm "./client/dist/embed-stats.json"
 
 # Creating the archives
 (
@@ -89,17 +96,20 @@ rm "./client/dist/en-US/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"
   github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$tar_name.asc" --file "$tar_name.asc"
 
-  git push origin develop
+  git push origin "$branch"
 
-  # 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 merge "$branch"
+      git push origin master
+      git checkout "$branch"
+  fi
 )