From dd5ae71e31b1c73dd0a7ae9c4fcdd28fcf8d6d8d Mon Sep 17 00:00:00 2001 From: Praveen Rewar <8457124+praveenrewar@users.noreply.github.com> Date: Wed, 30 Nov 2022 14:05:22 +0530 Subject: [PATCH 1/2] Bump golangci-lint to v0.50.1 --- .github/workflows/golangci-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 4ac363b6..7c71d087 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -22,6 +22,6 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: - version: v1.45.2 + version: v1.50.1 args: -v From fc39c9fbc7b4d95134737a9f1b67e6e3ea4db639 Mon Sep 17 00:00:00 2001 From: Praveen Rewar <8457124+praveenrewar@users.noreply.github.com> Date: Wed, 30 Nov 2022 12:43:17 +0530 Subject: [PATCH 2/2] Bump Go to v1.19.3 --- .github/workflows/golangci-lint.yml | 2 +- .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 | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 7c71d087..960c9e58 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -15,7 +15,7 @@ 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' 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..27767ee5 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.3" - 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 3ab4385e..c7e6c3cf 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 f72fae6d..39e062d5 100644 --- a/pkg/kbld/config/config.go +++ b/pkg/kbld/config/config.go @@ -337,7 +337,7 @@ 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 &&