Skip to content
This repository has been archived by the owner on May 23, 2023. It is now read-only.

Update the Travis script to allow publishing from v.0.0.0 branches. #195

Merged
merged 1 commit into from
Sep 28, 2017
Merged

Update the Travis script to allow publishing from v.0.0.0 branches. #195

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions travis/publish.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ is_pull_request() {
}

is_travis_branch_master_or_release() {
if [[ "${TRAVIS_BRANCH}" == "master" || "${TRAVIS_BRANCH}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
if [[ "${TRAVIS_BRANCH}" == "master" || "${TRAVIS_BRANCH}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
echo "[Publishing] Travis branch is ${TRAVIS_BRANCH}"
return 0
else
echo "[Not Publishing] Travis branch is not master or 0.0.0"
echo "[Not Publishing] Travis branch is not master or v0.0.0"
return 1
fi
}
Expand Down Expand Up @@ -87,10 +87,10 @@ release_version() {

safe_checkout_remote_branch() {
# We need to be on a branch for release:perform to be able to create commits,
# and we want that branch to be master or 0.0.0. which has been checked before.
# and we want that branch to be master or v0.0.0. which has been checked before.
# But we also want to make sure that we build and release exactly the tagged version,
# so we verify that the remote branch is where our tag is.
git checkout -B `release_version | sed 's/-RC[[:digit:]]\+//'`
git checkout -B v`release_version | sed 's/-RC[[:digit:]]\+//'`
git fetch origin "${TRAVIS_BRANCH}":origin/"${TRAVIS_BRANCH}"
commit_local="$(git show --pretty='format:%H' ${TRAVIS_BRANCH})"
commit_remote="$(git show --pretty='format:%H' origin/${TRAVIS_BRANCH})"
Expand Down