diff --git a/.promu.yml b/.promu.yml index a75d9c3..272f295 100644 --- a/.promu.yml +++ b/.promu.yml @@ -1,5 +1,5 @@ go: - version: "1.13" + version: "1.14" verbose: true repository: path: github.com/kbudde/rabbitmq_exporter diff --git a/.travis.yml b/.travis.yml index 3ebb782..244979a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,13 +5,13 @@ services: language: go go: - - "1.13" + - "1.14" env: global: - PATH=/home/travis/gopath/bin:$PATH - COMMIT=${TRAVIS_COMMIT::8} - - REPO=kbudde/rabbitmq-exporter + # - REPO=kbudde/rabbitmq-exporter - GO111MODULE=on before_install: - go get github.com/mitchellh/gox @@ -28,12 +28,12 @@ install: script: - go test -tags integration -covermode=count -coverprofile=coverage.out ./ -after_success: -#Build Docker image - - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD - - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi` - - make docker DOCKER_IMAGE_NAME=$REPO DOCKER_IMAGE_TAG=$TAG - - docker push $REPO +# after_success: +# #Build Docker image +# - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD +# - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi` +# - make docker DOCKER_IMAGE_NAME=$REPO DOCKER_IMAGE_TAG=$TAG +# - docker push $REPO #Build dist releases - if [ -n "$TRAVIS_TAG" ]; then make tarballs && promu release .tarballs ; fi diff --git a/Dockerfile b/Dockerfile index 81a8263..a24a221 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Accept the Go version for the image to be set as a build argument. # Default to Go 1.11 -ARG GO_VERSION=1.13 +ARG GO_VERSION=1.14 # First stage: build the executable. FROM golang:${GO_VERSION}-alpine AS builder diff --git a/go.mod b/go.mod index cf9e22e..a90525c 100644 --- a/go.mod +++ b/go.mod @@ -25,4 +25,4 @@ require ( gotest.tools v2.2.0+incompatible // indirect ) -go 1.13 +go 1.14