diff --git a/Dockerfile.build b/Dockerfile.build index 8086cb5..0fb30ac 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -14,7 +14,7 @@ # limitations under the License. # -ARG BASE=golang:1.16-alpine3.14 +ARG BASE=golang:1.17-alpine3.15 FROM ${BASE} ARG ALPINE_PKG_BASE="make git zip tar" diff --git a/bin/test-attribution-txt.sh b/bin/test-attribution-txt.sh index c173907..16bfcca 100755 --- a/bin/test-attribution-txt.sh +++ b/bin/test-attribution-txt.sh @@ -45,7 +45,7 @@ if [ ! -f Attribution.txt ]; then else # loop over every library in the modules.txt file in vendor while IFS= read -r lib; do - if ! grep -q "$lib" Attribution.txt && [ "$lib" != "explicit" ]; then + if ! grep -q "$lib" Attribution.txt && [ "$lib" != "explicit" ] && [ "$lib" != "explicit;" ]; then echo "An attribution for $lib is missing from in Attribution.txt, please add" # need to do this in a bash subshell, see SC2031 (( EXIT_CODE=1 )) diff --git a/go.mod b/go.mod index b8b8494..c2cd38d 100644 --- a/go.mod +++ b/go.mod @@ -5,4 +5,19 @@ require ( github.com/spf13/cobra v0.0.7 ) -go 1.16 +require ( + github.com/fxamacker/cbor/v2 v2.2.0 // indirect + github.com/go-playground/locales v0.13.0 // indirect + github.com/go-playground/universal-translator v0.17.0 // indirect + github.com/go-playground/validator/v10 v10.6.1 // indirect + github.com/google/uuid v1.2.0 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/leodido/go-urn v1.2.0 // indirect + github.com/spf13/pflag v1.0.3 // indirect + github.com/x448/float16 v0.8.4 // indirect + golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect + golang.org/x/sys v0.0.0-20190412213103-97732733099d // indirect + golang.org/x/text v0.3.2 // indirect +) + +go 1.17 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index fe50a28..7cb03ae 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -42,7 +42,7 @@ parts: source: . plugin: make build-snaps: - - go/1.16/stable + - go/1.17/stable override-build: | cd $SNAPCRAFT_PART_SRC make tidy