X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Frelease.sh;h=6f4da6a29c58f2d145a422dfa005d696e1100b0f;hb=0e4ffb4b678962d5ff7a4a7d8952033bc84725da;hp=ec76bb846cac5df12899bfd08ef7c3f509ab222f;hpb=fd206f0b2d7e5c8e00e2817266d90ec54f79e1da;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/release.sh b/scripts/release.sh
index ec76bb846..6f4da6a29 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
 
+set -eu
+
 shutdown() {
   # Get our process group id
-  PGID=$(ps -o pgid= $$ | grep -o [0-9]*)
+  PGID=$(ps -o pgid= $$ | grep -o "[0-9]*")
 
   # Kill it in a new new process group
-  setsid kill -- -$PGID
+  setsid kill -- -"$PGID"
   exit 0
 }
 
@@ -16,43 +18,69 @@ if [ -z "$1" ]; then
   exit -1
 fi
 
-if [ -z $GITHUB_TOKEN ]; then
+if [ -z "$GITHUB_TOKEN" ]; then
   echo "Need GITHUB_TOKEN env set."
   exit -1
 fi
 
+branch=$(git symbolic-ref --short -q HEAD)
+if [ "$branch" != "develop" ]; then
+  echo "Need to be on develop branch."
+  exit -1
+fi
+
 version="v$1"
 directory_name="peertube-$version"
 zip_name="peertube-$version.zip"
 
-cd ./client || exit -1
-npm version --no-git-tag-version --no-commit-hooks $1 || exit -1
+changelog=$(awk -v version="$version" '/## v/ { printit = $2 == version }; printit;' CHANGELOG.md | grep -v "$version" | sed '1{/^$/d}')
 
-cd ../ || exit -1
-npm version -f --no-git-tag-version --no-commit-hooks $1 || exit -1
+printf "Changelog will be:\n%s\n" "$changelog"
+
+read -p "Are you sure to release? " -n 1 -r
+echo
+if [[ ! $REPLY =~ ^[Yy]$ ]]
+then
+  exit 0
+fi
 
-git commit package.json client/package.json -m "Bumped to version $version" || exit -1
+( cd client
+  npm version --no-git-tag-version --no-commit-hooks "$1"
+)
+
+npm version -f --no-git-tag-version --no-commit-hooks "$1"
+
+git commit package.json client/package.json -m "Bumped to version $version"
 git tag -s -a "$version" -m "$version"
 
-npm run build || exit -1
-rm "./client/dist/stats.json" || exit -1
+npm run build
+rm "./client/dist/stats.json"
 
-cd ../ || exit -1
+cd ..
 
-ln -s "PeerTube" "$directory_name" || exit -1
+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" \
-                            || exit -1
-rm "$directory_name" || exit -1
+                            "$directory_name/tsconfig.json" "$directory_name/yarn.lock"
+
+rm "$directory_name"
 
-cd "PeerTube" || exit -1
+cd "PeerTube"
 
 git push origin --tag
 
-github-release release --user chocobozzz --repo peertube --tag "$version" --name "$version"
+github-release release --user chocobozzz --repo peertube --tag "$version" --name "$version" --description "$changelog"
 github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$zip_name" --file "$zip_name"
+
+git push origin develop
+
+# Update master branch
+git checkout master
+git rebase develop
+git push origin master
+git checkout develop
+