From 5a05e82744df5ee7e6a782b4ac1f2d9a52944b7e Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Fri, 17 Aug 2018 15:47:25 -0400 Subject: don't create dev-build-v#.#.# tags --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index a5841ba5..261a9982 100644 --- a/.travis.yml +++ b/.travis.yml @@ -152,8 +152,11 @@ notifications: on_success: never on_failure: never before_deploy: - - 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} + - | + 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} + fi deploy: - provider: releases api_key: -- cgit v1.3.1 From fa899453bbd3915fec2d54e06557aacad82ac3f5 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Fri, 17 Aug 2018 15:52:55 -0400 Subject: support slashes in branch names --- .travis.yml | 4 ++-- Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to '.travis.yml') 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) -- cgit v1.3.1