From 2318c6ea5051e2e9099a16b68ffb8aa14b605feb Mon Sep 17 00:00:00 2001 From: Michael Weber Date: Fri, 6 Nov 2020 09:47:56 -0800 Subject: [PATCH] switch to goboring/golang for building (FIPS 140-2) --- .circleci/config.yml | 2 +- Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b16e7d4..1f19650 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: build: working_directory: /go/workdir/src/github.com/splunk/vault-plugin-splunk docker: - - image: circleci/golang:1.13.4 + - image: goboring/golang:1.15.15b5 <<: *defaultenv - image: splunk/splunk:latest user: root diff --git a/Makefile b/Makefile index 9c8b3bf..1b5d9e3 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ test: build @test -n "$$SPLUNK_ADDR" || { echo 'warning: SPLUNK_ADDR not set, creating new Splunk instances. This will be slow.'; } mkdir -p $(dir $(TESTREPORT)) go clean -testcache || true - gotestsum --junitfile $(TESTREPORT) --format standard-verbose -- -cover -v ./... + $(GOBIN)/gotestsum --junitfile $(TESTREPORT) --format standard-verbose -- -cover -v ./... .PHONY: lint lint: dep @@ -36,6 +36,7 @@ lint: dep .PHONY: dep dep: + go get -u gotest.tools/gotestsum ./scripts/golangci-lint.sh -b $(GOBIN) v1.20.0 .PHONY: clean