X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Frelease.sh;h=ef6399b68a2ff6690892d6842d9909be49d84f06;hb=d5931e623320d0851a19e1001e90c7d8138d7a20;hp=dbc348cb20e0a294c376afd87698bae8105f59db;hpb=6c42d96e4692030eb68dd60bbc61475f909d404e;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/release.sh b/scripts/release.sh
index dbc348cb2..ef6399b68 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"
@@ -41,12 +47,11 @@ printf "Changelog will be:\\n%s\\n" "$changelog"
 
 read -p "Are you sure to release? " -n 1 -r
 echo
-if [[ ! $REPLY =~ ^[Yy]$ ]]
-then
+if [[ ! $REPLY =~ ^[Yy]$ ]]; then
   exit 0
 fi
 
-( 
+(
   cd client
   npm version --no-git-tag-version --no-commit-hooks "$1"
 )
@@ -57,49 +62,58 @@ 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/stats.json"
+rm "./client/dist/en_US/stats.json"
+rm "./client/dist/embed-stats.json"
 
 # Creating the archives
 (
+  # local variables
+  directories_to_archive=("$directory_name/CREDITS.md" "$directory_name/FAQ.md" \
+                          "$directory_name/LICENSE" "$directory_name/README.md" \
+                          "$directory_name/client/dist/" "$directory_name/client/yarn.lock" \
+                          "$directory_name/client/package.json" "$directory_name/config" \
+                          "$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 ..
   ln -s "PeerTube" "$directory_name"
-  zip -r "PeerTube/$zip_name" "$directory_name/CREDITS.md" "$directory_name/FAQ.md" \
-                              "$directory_name/LICENSE" "$directory_name/README.md" \
-                              "$directory_name/client/dist/" "$directory_name/client/yarn.lock" \
-                              "$directory_name/client/package.json" "$directory_name/config" \
-                              "$directory_name/dist" "$directory_name/package.json" \
-                              "$directory_name/scripts" "$directory_name/support" \
-                              "$directory_name/tsconfig.json" "$directory_name/yarn.lock"
-  gpg --armor --detach-sign -u 583A612D890159BE "PeerTube/$zip_name"
-  tar cfJ "PeerTube/$tar_name" "$directory_name/CREDITS.md" "$directory_name/FAQ.md" \
-                              "$directory_name/LICENSE" "$directory_name/README.md" \
-                              "$directory_name/client/dist/" "$directory_name/client/yarn.lock" \
-                              "$directory_name/client/package.json" "$directory_name/config" \
-                              "$directory_name/dist" "$directory_name/package.json" \
-                              "$directory_name/scripts" "$directory_name/support" \
-                              "$directory_name/tsconfig.json" "$directory_name/yarn.lock"
-  gpg --armor --detach-sign -u 583A612D890159BE "PeerTube/$tar_name"
 
+  # archive creation + signing
+  zip -r "PeerTube/$zip_name" "${directories_to_archive[@]}"
+  gpg --armor --detach-sign -u "$maintainer_public_key" "PeerTube/$zip_name"
+  XZ_OPT=-e9 tar cfJ "PeerTube/$tar_name" "${directories_to_archive[@]}"
+  gpg --armor --detach-sign -u "$maintainer_public_key" "PeerTube/$tar_name"
+
+  # temporary setup destruction
   rm "$directory_name"
 )
 
 # Creating the release on GitHub, with the created archives
 (
-  cd "PeerTube"
-
   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
 )