From 107c5fcda423faef9b9ec0804d6b8dd23fe848ce Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 11 Oct 2018 08:47:59 +0200
Subject: Fix release script

---
 scripts/release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/release.sh')

diff --git a/scripts/release.sh b/scripts/release.sh
index 7b577ef35..3a8643b5a 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -27,7 +27,7 @@ fi
 maintainer_public_key=${MAINTAINER_GPG:-"583A612D890159BE"}
 
 branch=$(git symbolic-ref --short -q HEAD)
-if [ "$branch" != "develop" ] && [[ "$branch" != feature/* ]]; then
+if [ "$branch" != "develop" ] && [[ "$branch" != release/* ]]; then
   echo "Need to be on develop or release branch."
   exit -1
 fi
-- 
cgit v1.2.3


From 225553a021eba517fed81c1ad0c9f5f5eab441e3 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 17 Oct 2018 08:42:54 +0200
Subject: Improve release script

---
 scripts/release.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts/release.sh')

diff --git a/scripts/release.sh b/scripts/release.sh
index 3a8643b5a..ccb93bc44 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -34,8 +34,8 @@ fi
 
 version="v$1"
 github_prerelease_option=""
-if [[ "$version" = *".pre."* ]]; then
-  echo "This is a pre-release."
+if [[ "$version" = *"-alpha."* ]] || [[ "$version" = *"-beta."* ]] || [[ "$version" = *"-rc."* ]]; then
+  echo -e "This is a pre-release.\n"
   github_prerelease_option="--pre-release"
 fi
 
@@ -45,7 +45,7 @@ tar_name="peertube-$version.tar.xz"
 
 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
-- 
cgit v1.2.3


From 6cc98dfff3d021c0c75e618e251fc99706459bf2 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 22 Nov 2018 15:04:14 +0100
Subject: Add open api bump version in release script

---
 scripts/release.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'scripts/release.sh')

diff --git a/scripts/release.sh b/scripts/release.sh
index ccb93bc44..134f2d288 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -60,7 +60,9 @@ 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
-- 
cgit v1.2.3


From b73ddc8a576531ae1398f3a2ad30c201290dcb12 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 3 Dec 2018 10:35:50 +0100
Subject: Fix release script

---
 scripts/release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/release.sh')

diff --git a/scripts/release.sh b/scripts/release.sh
index 134f2d288..08061fe6f 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -43,7 +43,7 @@ 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\\n%s\\n\\n" "$changelog"
 
-- 
cgit v1.2.3