X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Frelease.sh;h=4b45c959d521a17d9c681b472bfdd782ca1dc9b8;hb=3d52b300ea79bec21f090e2447c4808307078618;hp=b5fa68f424b43a16a3dfbbed0d18f5680a33f4e4;hpb=87bec1051b9706b4ae1efbd92e4d974c01d98c51;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/release.sh b/scripts/release.sh
index b5fa68f42..4b45c959d 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -25,8 +25,8 @@ 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
 
@@ -102,14 +102,14 @@ rm "./client/dist/embed-stats.json"
   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"
 
   # 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 merge "$branch"
       git push origin master
-      git checkout develop
+      git checkout "$branch"
   fi
 )