Skip to content

Commit

Permalink
switch back to travis CI (#744)
Browse files Browse the repository at this point in the history
update consul and vault CI versions
update README.md to point to travis for build status
  • Loading branch information
nathanejohnson authored and Aaron Hurt committed Jan 24, 2020
1 parent 235f01f commit 4425372
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
10 changes: 10 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
dist: bioinic
sudo: false
language: go

go:
- "1.13"
- master

script:
- make travis
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ GOVERSION ?= $(shell go version | awk '{print $$3;}')
GORELEASER ?= $(shell which goreleaser)

# pin versions for CI builds
CI_CONSUL_VERSION ?= 1.6.1
CI_VAULT_VERSION ?= 1.2.3
CI_CONSUL_VERSION ?= 1.6.2
CI_VAULT_VERSION ?= 1.3.1

# all is the default target
all: test
Expand Down Expand Up @@ -108,8 +108,8 @@ docker-test:
-f Dockerfile \
.

# codeship runs the CI on codeship
codeship:
# travis runs the CI on travis
travis:
go version
go env
wget -O ~/consul.zip https://releases.hashicorp.com/consul/$(CI_CONSUL_VERSION)/consul_$(CI_CONSUL_VERSION)_linux_amd64.zip
Expand All @@ -118,7 +118,7 @@ codeship:
unzip -o -d ~/bin ~/vault.zip
vault --version
consul --version
cd ~/src/github.com/fabiolb/fabio && make test
make test

# clean removes intermediate files
clean:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<p align="center" style="margin-top: 16px">
<a href="https://github.com/fabiolb/fabio/releases/latest"><img alt="Release" src="https://img.shields.io/github/release/fabiolb/fabio.svg?style=flat-square"></a>
<a href="https://raw.githubusercontent.com/fabiolb/fabio/master/LICENSE"><img alt="License MIT" src="https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square"></a>
<a href="https://app.codeship.com/projects/222209"><img alt="Codeship CI Status" src="https://img.shields.io/codeship/3e8307d0-2426-0135-1183-6e6f38f65fc4/master.svg?label=codeship&style=flat-square"></a>
<a href="https://travis-ci.org/fabiolb/fabio"><img alt="Travis CI Status" src="https://travis-ci.org/fabiolb/fabio.svg?branch=master"></a>
<a href="https://github.com/fabiolb/fabio/releases"><img alt="Downloads" src="https://img.shields.io/github/downloads/fabiolb/fabio/total.svg?style=flat-square"></a>
<a href="https://hub.docker.com/r/fabiolb/fabio/"><img alt="Docker Pulls fabiolb" src="https://img.shields.io/docker/pulls/fabiolb/fabio.svg?style=flat-square&label=docker+pulls+fabiolb"></a>
</p>
Expand Down

0 comments on commit 4425372

Please sign in to comment.