From ec5c0ac3e0e0ba3c12fe9c1fa09142a340f9382b Mon Sep 17 00:00:00 2001 From: Matthias Kadenbach Date: Thu, 23 Feb 2017 10:36:33 -0800 Subject: [PATCH] fix version string --- .travis.yml | 4 ++-- Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9700a58..6581f68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ go: - 1.8 env: - - MIGRATE_TEST_CONTAINER_BOOT_DELAY=15 + - MIGRATE_TEST_CONTAINER_BOOT_DELAY=10 # TODO: https://docs.docker.com/engine/installation/linux/ubuntu/ # pre-provision with travis docker setup and pin down docker version in install step @@ -29,7 +29,7 @@ after_success: before_deploy: - make build-cli - gem install --no-ri --no-rdoc fpm - - fpm -s dir -t deb -n migrate -v "$(git describe --tags 2>/dev/null)" --license MIT -m matthias.kadenbach@gmail.com --url https://github.com/mattes/migrate --description='Database migrations' -a amd64 -p migrate.$(git describe --tags 2>/dev/null).deb --deb-no-default-config-files -f -C cli/build migrate.linux-amd64=/usr/bin/migrate + - fpm -s dir -t deb -n migrate -v "$(git describe --tags 2>/dev/null | cut -c 2-)" --license MIT -m matthias.kadenbach@gmail.com --url https://github.com/mattes/migrate --description='Database migrations' -a amd64 -p migrate.$(git describe --tags 2>/dev/null | cut -c 2-).deb --deb-no-default-config-files -f -C cli/build migrate.linux-amd64=/usr/bin/migrate deploy: - provider: releases diff --git a/Makefile b/Makefile index 2e6817b..18528fe 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SOURCE ?= file go-bindata github DATABASE ?= postgres -VERSION ?= $(shell git describe --tags 2>/dev/null) +VERSION ?= $(shell git describe --tags 2>/dev/null | cut -c 2-) TEST_FLAGS ?= REPO_OWNER ?= $(shell cd .. && basename "$$(pwd)")