From 1038cbd1a3629fb2c9a2571d59b066800b2d2e20 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Sat, 9 Jan 2016 14:01:27 +0000 Subject: [PATCH 1/3] shrink Travis usage There is no point running builds, tests, lints on Travis, since we already do that on Circle. The only thing we aren't doing (and can't do) on Circle is doc publishing, so now Travis does just that. --- .travis.yml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0439e89b..4938c760 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,28 +1,12 @@ language: go sudo: false -go: - - 1.4 env: - PATH="${PATH}:${HOME}/.local/bin" -addons: - apt: - packages: - - libpcap-dev - install: - - go clean -i net - - go install -tags netgo std - - go get github.com/golang/lint/golint - pip install --user --upgrade gsutil - bin/setup-ci-secrets $encrypted_5ba036e89377_key $encrypted_5ba036e89377_iv - - make travis - - go get ./... script: - - make tests - -after_success: - - go get github.com/mattn/goveralls - - test "${TRAVIS_PULL_REQUEST}" = "false" && site/build-and-publish.sh + - 'test "${TRAVIS_PULL_REQUEST}" = "false" && site/build-and-publish.sh || true' From 1d8d098450b6b7d5d0e2755db0b9019c78bf837c Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Sat, 9 Jan 2016 14:06:45 +0000 Subject: [PATCH 2/3] for Travis, this no longer is a go project Travis insists that one picks a project language. There is no go left in the steps executed by travis. Instead we have Python, Ruby and shell. Let's pick the first... Picking Python makes travis unhappy with "Can not perform a '--user' install. User site-packages are not visible in this virtualenv". Dropping the '--user' flag fixes that. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4938c760..5e23cac7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ -language: go +language: python sudo: false env: - PATH="${PATH}:${HOME}/.local/bin" install: - - pip install --user --upgrade gsutil + - pip install --upgrade gsutil - bin/setup-ci-secrets $encrypted_5ba036e89377_key $encrypted_5ba036e89377_iv script: From abea21245d5045362143d8133c51d38789dbce19 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Mon, 11 Jan 2016 10:33:33 +0000 Subject: [PATCH 3/3] rename Makefile target since travis is no longer using it --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7fc3eb5c..947744c6 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ PACKAGE_BASE=$(shell go list -e ./) all: $(WEAVE_EXPORT) $(RUNNER_EXE) $(TEST_TLS_EXE) -travis: $(EXES) +exes: $(EXES) update: go get -u -f -v -tags netgo $(addprefix ./,$(dir $(EXES)))