summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLex Neva <github.com@lexneva.name>2018-08-17 15:52:55 -0400
committerLex Neva <github.com@lexneva.name>2018-08-17 15:59:38 -0400
commitfa899453bbd3915fec2d54e06557aacad82ac3f5 (patch)
treedee9829fb93c51ae328586f6ca1330cfc5c97783
parent5a05e82744df5ee7e6a782b4ac1f2d9a52944b7e (diff)
support slashes in branch names
-rw-r--r--.travis.yml4
-rw-r--r--Makefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 261a9982..a3f6360b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -154,8 +154,8 @@ notifications:
before_deploy:
- |
if [[ !("$TRAVIS_TAG" =~ ^v[0-9.]+$) ]]; then
- git tag -f dev-build-${TRAVIS_BRANCH}
- git push -f https://${TRAVIS_REPO_SLUG%/*}:${GITHUB_API_KEY}@github.com/${TRAVIS_REPO_SLUG}.git dev-build-${TRAVIS_BRANCH}
+ git tag -f dev-build-${TRAVIS_BRANCH//\//-}
+ git push -f https://${TRAVIS_REPO_SLUG%/*}:${GITHUB_API_KEY}@github.com/${TRAVIS_REPO_SLUG}.git dev-build-${TRAVIS_BRANCH//\//-}
fi
deploy:
- provider: releases
diff --git a/Makefile b/Makefile
index 52ac919f..4c31f17e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
EXTENSIONS:=inkstitch
# This gets the branch name or the name of the tag
-VERSION:=$(TRAVIS_BRANCH)
+VERSION:=$(subst /,-,$(TRAVIS_BRANCH))
OS:=$(TRAVIS_OS_NAME)
ARCH:=$(shell uname -m)