From 05f79b33acd4433c42cc186d38ac5704a7302b2b Mon Sep 17 00:00:00 2001 From: Acconut Date: Mon, 14 Jan 2019 00:22:12 +0100 Subject: [PATCH] Only test the prometheuscollector on supported versions --- .scripts/test_all.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.scripts/test_all.sh b/.scripts/test_all.sh index 652cb14..1837c7f 100755 --- a/.scripts/test_all.sh +++ b/.scripts/test_all.sh @@ -21,9 +21,13 @@ if [[ "$goversion" == *"go1.5"* ]] || echo "Skipping tests requiring GCSStore, which is not supported on $goversion" packages=$(echo "$packages" | sed '/gcsstore/d') + + echo "Skipping tests requiring Prometheus, which is not supported on $goversion" + packages=$(echo "$packages" | sed '/prometheuscollector/d') else - # Install the Consul packages which are not vendored. + # Install the Consul and Prometheus client packages which are not vendored. go get -u github.com/hashicorp/consul/... + go get -u github.com/prometheus/client_golang/prometheus fi install_etcd_pkgs() { @@ -48,9 +52,8 @@ else install_etcd_pkgs fi -# Install the AWS SDK and Prometheus client which is explicitly not vendored +# Install the AWS SDK which is explicitly not vendored go get -u github.com/aws/aws-sdk-go/... -go get -u github.com/prometheus/client_golang/prometheus # Test all packages which are allowed on all Go versions go test $packages