diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-10-11 09:52:16 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2018-10-11 09:52:16 +0200 |
| commit | 71e318b4fe66175d03c7c82357d60062eb68af81 (patch) | |
| tree | 1e6bbfa16c9aab32174ec2a87b44f357d5382f07 /scripts | |
| parent | cc1903ad2a16adf14eaa4f5429e35c455cf93bea (diff) | |
| parent | 333210d862fdba4bb114b756d4f964789f480196 (diff) | |
| download | PeerTube-71e318b4fe66175d03c7c82357d60062eb68af81.tar.gz PeerTube-71e318b4fe66175d03c7c82357d60062eb68af81.tar.zst PeerTube-71e318b4fe66175d03c7c82357d60062eb68af81.zip | |
Merge branch 'release/v1.0.0' into develop
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/release.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 27 | maintainer_public_key=${MAINTAINER_GPG:-"583A612D890159BE"} | 27 | maintainer_public_key=${MAINTAINER_GPG:-"583A612D890159BE"} |
| 28 | 28 | ||
| 29 | branch=$(git symbolic-ref --short -q HEAD) | 29 | branch=$(git symbolic-ref --short -q HEAD) |
| 30 | if [ "$branch" != "develop" ] && [[ "$branch" != feature/* ]]; then | 30 | if [ "$branch" != "develop" ] && [[ "$branch" != release/* ]]; then |
| 31 | echo "Need to be on develop or release branch." | 31 | echo "Need to be on develop or release branch." |
| 32 | exit -1 | 32 | exit -1 |
| 33 | fi | 33 | fi |