From 2f512220e9ed4b8e06292be2b2d1441bd22110b7 Mon Sep 17 00:00:00 2001 From: rcmadhankumar Date: Mon, 15 Apr 2024 20:21:15 +0530 Subject: [PATCH 1/2] Bump go version 1.21.9 Signed-off-by: rcmadhankumar --- .github/workflows/golangci-lint.yml | 6 +++--- .github/workflows/release.yml | 2 +- .github/workflows/test-gh.yml | 2 +- .github/workflows/trivy-scan.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index fe7d6f58..b4b67b1f 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.21.3 + go-version: 1.21.9 - uses: actions/checkout@v2 with: fetch-depth: '0' - name: golangci-lint - uses: golangci/golangci-lint-action@v3.4.0 + uses: golangci/golangci-lint-action@v3 with: - version: v1.52.2 + version: v1.54 args: -v diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b631a29d..1d2a2b80 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: 1.21.5 + go-version: 1.21.9 - name: Retrieve version run: | echo "TAG_NAME=$(echo ${{ github.ref }} | grep -Eo 'v[0-9].*')" >> $GITHUB_OUTPUT diff --git a/.github/workflows/test-gh.yml b/.github/workflows/test-gh.yml index 8e2cc8da..3f0baa7b 100644 --- a/.github/workflows/test-gh.yml +++ b/.github/workflows/test-gh.yml @@ -13,7 +13,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v1 with: - go-version: 1.21.5 + go-version: 1.21.9 - name: Check out code into the Go module directory uses: actions/checkout@v1 with: diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index 15a6dd70..126b2dc3 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -10,7 +10,7 @@ jobs: with: repo: carvel-dev/vendir tool: vendir - goVersion: 1.21.5 + goVersion: 1.21.9 secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} slackWebhookURL: ${{ secrets.SLACK_WEBHOOK_URL }} From 99974c9332630e0b53cad8a3c9085430d338027d Mon Sep 17 00:00:00 2001 From: rcmadhankumar Date: Tue, 16 Apr 2024 18:00:12 +0530 Subject: [PATCH 2/2] Update imgpkg version 0.38.4 Signed-off-by: rcmadhankumar --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 3834fb53..23d2bc57 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.4 - github.com/vmware-tanzu/carvel-imgpkg v0.38.3 + github.com/vmware-tanzu/carvel-imgpkg v0.38.4 golang.org/x/crypto v0.14.0 golang.org/x/oauth2 v0.8.0 golang.org/x/tools v0.12.0 diff --git a/go.sum b/go.sum index ea1a91ab..b61deff0 100644 --- a/go.sum +++ b/go.sum @@ -335,8 +335,8 @@ github.com/vbatts/tar-split v0.11.3 h1:hLFqsOLQ1SsppQNTMpkpPXClLDfC2A3Zgy9OUU+RV github.com/vbatts/tar-split v0.11.3/go.mod h1:9QlHN18E+fEH7RdG+QAJJcuya3rqT7eXSTY7wGrAokY= github.com/vito/go-interact v1.0.1 h1:O8xi8c93bRUv2Tb/v6HdiuGc+WnWt+AQzF74MOOdlBs= github.com/vito/go-interact v1.0.1/go.mod h1:HrdHSJXD2yn1MhlTwSIMeFgQ5WftiIorszVGd3S/DAA= -github.com/vmware-tanzu/carvel-imgpkg v0.38.3 h1:vVnqCPFEZ2NQcoTywg/va91qRyCuu46wBYAETqoyez4= -github.com/vmware-tanzu/carvel-imgpkg v0.38.3/go.mod h1:v9BcO1qfXwwIQFw2zmksdUkx8eI1e+/a0Md3xG2BzDE= +github.com/vmware-tanzu/carvel-imgpkg v0.38.4 h1:58YL5+1ERrKOTKQ6CU2a3QriUIceYGixEGqF33NMN3Q= +github.com/vmware-tanzu/carvel-imgpkg v0.38.4/go.mod h1:v9BcO1qfXwwIQFw2zmksdUkx8eI1e+/a0Md3xG2BzDE= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= diff --git a/vendor/modules.txt b/vendor/modules.txt index 7c702473..a071fb21 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -367,7 +367,7 @@ github.com/vbatts/tar-split/archive/tar # github.com/vito/go-interact v1.0.1 ## explicit; go 1.12 github.com/vito/go-interact/interact -# github.com/vmware-tanzu/carvel-imgpkg v0.38.3 +# github.com/vmware-tanzu/carvel-imgpkg v0.38.4 ## explicit; go 1.21 github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/bundle github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/image