OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Upgrade release script to support release branch

pull/868/merge
Chocobozzz 2018-08-01 11:13:33 +02:00
parent 67db1db105
commit 5e319fb789
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/release.sh
View File

@ -25,8 +25,8 @@ if [ -z "$GITHUB_TOKEN" ]; then
fi fi
branch=$(git symbolic-ref --short -q HEAD) branch=$(git symbolic-ref --short -q HEAD)
if [ "$branch" != "develop" ]; then if [ "$branch" != "develop" ] && [[ "$branch" != feature/* ]]; then
echo "Need to be on develop branch." echo "Need to be on develop or release branch."
exit -1 exit -1
fi fi
@ -102,14 +102,14 @@ rm "./client/dist/embed-stats.json"
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" --file "$tar_name"
github-release upload --user chocobozzz --repo peertube --tag "$version" --name "$tar_name.asc" --file "$tar_name.asc" 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"
# Only update master if it is not a pre release # Only update master if it is not a pre release
if [ -z "$github_prerelease_option" ]; then if [ -z "$github_prerelease_option" ]; then
# Update master branch # Update master branch
git checkout master git checkout master
git rebase develop git merge "$branch"
git push origin master git push origin master
git checkout develop git checkout "$branch"
fi fi
) )