Merge pull request #1613 from sdurrheimer/fix-circleci-flanky-go-get

Fix CircleCI flanky go get
This commit is contained in:
Fabian Reinartz 2016-05-06 10:22:43 +02:00
commit d5a9ce18c5
2 changed files with 3 additions and 25 deletions

View File

@ -7,7 +7,7 @@ build:
path: ./cmd/prometheus
- name: promtool
path: ./cmd/promtool
flags: -tags netgo
flags: -a -tags netgo
ldflags: |
-X {{repoPath}}/version.Version={{.Version}}
-X {{repoPath}}/version.Revision={{.Revision}}
@ -21,25 +21,3 @@ tarball:
- documentation/examples/prometheus.yml
- LICENSE
- NOTICE
crossbuild:
platforms:
- linux/amd64
- linux/386
- darwin/amd64
- darwin/386
- windows/amd64
- windows/386
- freebsd/amd64
- freebsd/386
- openbsd/amd64
- openbsd/386
- netbsd/amd64
- netbsd/386
- dragonfly/amd64
- linux/arm
- linux/arm64
- freebsd/arm
- openbsd/arm
- netbsd/arm
- linux/ppc64
- linux/ppc64le

View File

@ -2,7 +2,7 @@ machine:
environment:
DOCKER_IMAGE_NAME: prom/prometheus
QUAY_IMAGE_NAME: quay.io/prometheus/prometheus
DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.5.4-main
DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.6.2-main
REPO_PATH: github.com/prometheus/prometheus
pre:
- sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci'
@ -13,7 +13,7 @@ machine:
dependencies:
pre:
- go get -u github.com/prometheus/promu
- make promu
- docker info
override:
- promu crossbuild