From bbc3df7c186c20416785398fc6f1b158ea97d919 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 21 Mar 2017 20:36:11 -0400 Subject: [PATCH] simplify vars, remove unused tooling --- .travis.yml | 14 -------------- Makefile | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index e8e31779e..cf693adac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,20 +12,6 @@ branches: except: - /^\d+$/ -env: - global: - # compiler command for Travis - - CXX=g++-4.8 - # build number used by blt pipeline - - CI_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER - -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - before_install: - echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > .npmrc diff --git a/Makefile b/Makefile index ca320af89..f8d795813 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -CI_BUILD_NUMBER ?= $(USER)-snapshot -VERSION ?= 1.0.$(CI_BUILD_NUMBER) +TRAVIS_BUILD_NUMBER ?= $(USER)-snapshot +VERSION ?= 1.0.$(TRAVIS_BUILD_NUMBER) version: @echo $(VERSION)