X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Frelease.sh;h=665f690bbddd18a57076041eafc3c7873307c2fe;hb=c6c0fa6cd8fe8f752463d8982c3dbcd448739c4e;hp=9adfe2b5d0727e5e5d56eec9be9f34bb2253002f;hpb=379acb21bcc491efdc0118ea714790bb34238d66;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/release.sh b/scripts/release.sh
index 9adfe2b5d..665f690bb 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -24,25 +24,32 @@ if [ -z "$GITHUB_TOKEN" ]; then
   exit -1
 fi
 
+maintainer_public_key=${MAINTAINER_GPG:-"583A612D890159BE"}
+
 branch=$(git symbolic-ref --short -q HEAD)
-if [ "$branch" != "develop" ]; then
-  echo "Need to be on develop branch."
+if [ "$branch" != "develop" ] && [[ "$branch" != release/* ]]; then
+  echo "Need to be on develop or release branch."
   exit -1
 fi
 
 version="v$1"
+github_prerelease_option=""
+if [[ "$version" = *"-alpha."* ]] || [[ "$version" = *"-beta."* ]] || [[ "$version" = *"-rc."* ]]; then
+  echo -e "This is a pre-release.\n"
+  github_prerelease_option="--pre-release"
+fi
+
 directory_name="peertube-$version"
 zip_name="peertube-$version.zip"
 tar_name="peertube-$version.tar.xz"
 
-changelog=$(awk -v version="$version" '/## v/ { printit = $2 == version }; printit;' CHANGELOG.md | grep -v "$version" | sed '1{/^$/d}')
+changelog=$(awk -v version="$version" '/## v/ { printit = $2 == version }; printit;' CHANGELOG.md | grep -v "## $version" | sed '1{/^$/d}')
 
-printf "Changelog will be:\\n%s\\n" "$changelog"
+printf "Changelog will be:\\n\\n%s\\n\\n" "$changelog"
 
 read -p "Are you sure to release? " -n 1 -r
 echo
-if [[ ! $REPLY =~ ^[Yy]$ ]]
-then
+if [[ ! $REPLY =~ ^[Yy]$ ]]; then
   exit 0
 fi
 
@@ -53,12 +60,14 @@ fi
 
 npm version -f --no-git-tag-version --no-commit-hooks "$1"
 
-git commit package.json client/package.json -m "Bumped to version $version"
+./scripts/openapi-peertube-version.sh
+
+git commit package.json client/package.json ./support/doc/api/openapi.yaml -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/embed-stats.json"
+rm -f "./client/dist/en-US/stats.json"
+rm -f "./client/dist/embed-stats.json"
 
 # Creating the archives
 (
@@ -70,7 +79,6 @@ rm "./client/dist/embed-stats.json"
                           "$directory_name/dist" "$directory_name/package.json" \
                           "$directory_name/scripts" "$directory_name/support" \
                           "$directory_name/tsconfig.json" "$directory_name/yarn.lock")
-  maintainer_public_key="583A612D890159BE"
 
   # temporary setup
   cd ..
@@ -90,17 +98,25 @@ rm "./client/dist/embed-stats.json"
 (
   git push origin --tag
 
-  github-release release --user chocobozzz --repo peertube --tag "$version" --name "$version" --description "$changelog"
+  if [ -z "$github_prerelease_option" ]; then
+    github-release release --user chocobozzz --repo peertube --tag "$version" --name "$version" --description "$changelog"
+  else
+    github-release release --user chocobozzz --repo peertube --tag "$version" --name "$version" --description "$changelog" "$github_prerelease_option"
+  fi
+
   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
 )