Skip to content

Commit

Permalink
Fix CI build failures (#140)
Browse files Browse the repository at this point in the history
* TravisCI: revert to Trusty as distro, Xenial does not support rabbitmq yet
* CircleCI: add rabbitmq service
* AppVeyor: remove rabbitmq service install and don't test RabbitMQ exporter
  • Loading branch information
basvanbeek authored Jul 31, 2019
1 parent f0327f0 commit b1a3538
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
language: go
dist: trusty

services:
- rabbitmq
Expand All @@ -8,13 +9,13 @@ sudo: false
matrix:
include:
- go: "1.9.x"
- go: "1.10.x"
- go: "1.10.x"
- go: "1.11.x"
env:
- GO111MODULE=on
- go: "1.12.x"
env:
- GO111MODULE=on
- GO111MODULE=on
- go: "tip"
env:
- GO111MODULE=on
Expand Down
3 changes: 0 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ environment:
GOFLAGS: -mod=readonly

install:
- choco install rabbitmq --ignoredependencies -y
- echo %PATH%
- echo %GOPATH%
- set PATH=%GOPATH%\bin;c:\go\bin;%PATH%
- go version
- go env
Expand Down
5 changes: 5 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,10 @@ jobs:
- image: circleci/golang
steps:
- checkout
- run: echo 'deb http://www.rabbitmq.com/debian/ testing main' | sudo tee /etc/apt/sources.list.d/rabbitmq.list
- run: wget -O- https://www.rabbitmq.com/rabbitmq-release-signing-key.asc | sudo apt-key add -
- run: sudo apt-get update
- run: sudo apt-get install rabbitmq-server
- run: sudo service rabbitmq-server start
- run: go get -t -v -d ./...
- run: make vet test bench
2 changes: 1 addition & 1 deletion reporter/amqp/amqp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var spans = []*model.SpanModel{
}

func TestRabbitProduce(t *testing.T) {
address := "amqp://guest:guest@127.0.0.1:5672/"
address := "amqp://guest:guest@localhost:5672/"
_, ch, closeFunc := setupRabbit(t, address)
defer closeFunc()

Expand Down

0 comments on commit b1a3538

Please sign in to comment.