aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/release.sh10
1 files changed, 5 insertions, 5 deletions
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
25fi 25fi
26 26
27branch=$(git symbolic-ref --short -q HEAD) 27branch=$(git symbolic-ref --short -q HEAD)
28if [ "$branch" != "develop" ]; then 28if [ "$branch" != "develop" ] && [[ "$branch" != feature/* ]]; then
29 echo "Need to be on develop branch." 29 echo "Need to be on develop or release branch."
30 exit -1 30 exit -1
31fi 31fi
32 32
@@ -102,14 +102,14 @@ rm "./client/dist/embed-stats.json"
102 github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$tar_name" --file "$tar_name" 102 github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$tar_name" --file "$tar_name"
103 github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$tar_name.asc" --file "$tar_name.asc" 103 github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$tar_name.asc" --file "$tar_name.asc"
104 104
105 git push origin develop 105 git push origin "$branch"
106 106
107 # Only update master if it is not a pre release 107 # Only update master if it is not a pre release
108 if [ -z "$github_prerelease_option" ]; then 108 if [ -z "$github_prerelease_option" ]; then
109 # Update master branch 109 # Update master branch
110 git checkout master 110 git checkout master
111 git rebase develop 111 git merge "$branch"
112 git push origin master 112 git push origin master
113 git checkout develop 113 git checkout "$branch"
114 fi 114 fi
115) 115)