From 18f7bc3c617b14792eb9912bfc8139a3f5be0e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= Date: Thu, 1 Dec 2022 09:57:17 -0600 Subject: [PATCH] V0.34.0 deps bump (#302) * Fix comment spacing Signed-off-by: Joao Pereira * Change golang version to 1.19 Signed-off-by: Joao Pereira Signed-off-by: Joao Pereira --- .github/workflows/golangci-lint.yml | 4 ++-- .github/workflows/release.yml | 2 +- .github/workflows/test-gh.yml | 2 +- .github/workflows/trivy-scan.yml | 2 +- go.mod | 2 +- hack/Dockerfile.dev | 2 +- pkg/kbld/config/config.go | 3 ++- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 4ac363b6..960c9e58 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -15,13 +15,13 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: "1.18" + go-version: "1.19.3" - uses: actions/checkout@v2 with: fetch-depth: '0' - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: - version: v1.45.2 + version: v1.50.1 args: -v diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0d038c08..c62d4bef 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.18 + go-version: 1.19.3 - name: Run GoReleaser # GoReleaser v2.5.0 diff --git a/.github/workflows/test-gh.yml b/.github/workflows/test-gh.yml index 4ef7b85d..9159d14d 100644 --- a/.github/workflows/test-gh.yml +++ b/.github/workflows/test-gh.yml @@ -22,7 +22,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v2 with: - go-version: "1.18" + go-version: "1.19" - name: Check out code into the Go module directory uses: actions/checkout@v2 with: diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 14fc0c6c..a2ee9060 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -10,7 +10,7 @@ jobs: with: repo: vmware-tanzu/carvel-kbld tool: kbld - goVersion: 1.18 + goVersion: 1.19.3 secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} slackWebhookURL: ${{ secrets.SLACK_WEBHOOK_URL }} diff --git a/go.mod b/go.mod index a4dda516..0dce390e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/vmware-tanzu/carvel-kbld -go 1.18 +go 1.19 require ( github.com/cppforlife/cobrautil v0.0.0-20200514214827-bb86e6965d72 diff --git a/hack/Dockerfile.dev b/hack/Dockerfile.dev index 49caf332..a4793096 100644 --- a/hack/Dockerfile.dev +++ b/hack/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM golang:1.18 +FROM golang:1.19 RUN apt-get update -y RUN apt-get install docker.io apt-transport-https ca-certificates gnupg python -y diff --git a/pkg/kbld/config/config.go b/pkg/kbld/config/config.go index d2881a97..70976ea6 100644 --- a/pkg/kbld/config/config.go +++ b/pkg/kbld/config/config.go @@ -325,7 +325,8 @@ func (d Config) WriteToFile(path string) error { } // Equal reports whether this ImageOverride is equal to another ImageOverride. -// (`ImageMeta` is descriptive — not identifying — so not part of equality) +// +// (`ImageMeta` is descriptive — not identifying — so not part of equality) func (d ImageOverride) Equal(other ImageOverride) bool { return d.ImageRef == other.ImageRef && d.NewImage == other.NewImage &&