From b0025fa29bdd1fd4ceabefc8598e416704abd50e Mon Sep 17 00:00:00 2001 From: "Izaak Alpert (karlhungus)" Date: Tue, 12 Sep 2023 15:06:51 -0400 Subject: [PATCH] update to 1.21.1, fix up golangci-lint --- Dockerfile | 2 +- go.mod | 2 +- hack/fetch-golangci-lint.sh | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0b4d786..46b26c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21 as build +FROM golang:1.21.1 as build WORKDIR /go/src/app diff --git a/go.mod b/go.mod index 5056ecd..225b6f7 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/salesforce/kubelet-summary-exporter go 1.21 -toolchain go1.21.0 +toolchain go1.21.1 require ( github.com/alecthomas/kong v0.7.1 diff --git a/hack/fetch-golangci-lint.sh b/hack/fetch-golangci-lint.sh index 965fe9a..8efd7b6 100755 --- a/hack/fetch-golangci-lint.sh +++ b/hack/fetch-golangci-lint.sh @@ -9,10 +9,10 @@ goos="unknown" if [[ "$OSTYPE" == "linux-gnu" ]]; then goos="linux" - golangci_lint_sha256="17c9ca05253efe833d47f38caf670aad2202b5e6515879a99873fabd4c7452b3" + golangci_lint_sha256="762ef7c877d9baa4a3ffcc69c88ecf35faf47cd76c1394792d5fecc15f6dc84b" elif [[ "$OSTYPE" == "darwin"* ]]; then goos="darwin" - golangci_lint_sha256="925c4097eae9e035b0b052a66d0a149f861e2ab611a4e677c7ffd2d4e05b9b89" + golangci_lint_sha256="04d936f68895a9127999fdfa78872a3245d89dd6900c147dc9106c06870b9c5b" fi srcdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." >/dev/null 2>&1 && pwd )" @@ -25,8 +25,7 @@ fi workdir=$(mktemp -d) function cleanup { - echo $workdir -echo foo # rm -rf "$workdir" + rm -rf "$workdir" } trap cleanup EXIT