From 862593cc9b274e0b12b508d87121bc4adcf480c6 Mon Sep 17 00:00:00 2001 From: sethiyash Date: Thu, 9 Nov 2023 12:53:06 +0530 Subject: [PATCH 1/2] Bump go version to 1.20.11 Signed-off-by: sethiyash --- .github/workflows/golangci-lint.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test-gh.yml | 2 +- .github/workflows/trivy-scan.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index cc73a63a..453932ec 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.20.10" + go-version: "1.20.11" - uses: actions/checkout@v2 with: fetch-depth: '0' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d916cc19..21b2f434 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.20.10 + go-version: 1.20.11 - 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 37dafd2e..741761a9 100644 --- a/.github/workflows/test-gh.yml +++ b/.github/workflows/test-gh.yml @@ -23,7 +23,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v3 with: - go-version: "1.20.10" + go-version: "1.20.11" - name: Check out code into the Go module directory uses: actions/checkout@v3.3.0 with: diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml index b5fcd52b..7558474f 100644 --- a/.github/workflows/trivy-scan.yml +++ b/.github/workflows/trivy-scan.yml @@ -10,7 +10,7 @@ jobs: with: repo: carvel-dev/kbld tool: kbld - goVersion: 1.20.10 + goVersion: 1.20.11 secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} slackWebhookURL: ${{ secrets.SLACK_WEBHOOK_URL }} From 4a4b2acc85429330fe358b6876f4d3b0f114fd97 Mon Sep 17 00:00:00 2001 From: rcmadhankumar Date: Fri, 10 Nov 2023 15:42:12 +0530 Subject: [PATCH 2/2] Bumping imgpkg v0.37.8 and vendir v0.34.9 Signed-off-by: rcmadhankumar --- go.mod | 4 ++-- go.sum | 8 ++++---- vendor/modules.txt | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 2c5797fc..adff83fa 100644 --- a/go.mod +++ b/go.mod @@ -10,8 +10,8 @@ require ( github.com/kisielk/errcheck v1.6.3 github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.4 - github.com/vmware-tanzu/carvel-imgpkg v0.37.6 - github.com/vmware-tanzu/carvel-vendir v0.34.7 + github.com/vmware-tanzu/carvel-imgpkg v0.37.8 + github.com/vmware-tanzu/carvel-vendir v0.34.9 golang.org/x/sync v0.3.0 k8s.io/apimachinery v0.28.1 sigs.k8s.io/yaml v1.3.0 diff --git a/go.sum b/go.sum index 6f09623e..f1860198 100644 --- a/go.sum +++ b/go.sum @@ -123,10 +123,10 @@ 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.37.6 h1:2q1MJF5Vs9YL+ovcgXIIxonJFvak1sfrsp/VLomkQw4= -github.com/vmware-tanzu/carvel-imgpkg v0.37.6/go.mod h1:X0WGElm/Eiy42HkAu8I8nPg8wjPrVsfpt7MrTWkh4pQ= -github.com/vmware-tanzu/carvel-vendir v0.34.7 h1:CIeUJz1S+wUdUTS+mOZtPMbtzSGQOouAWEDpua92/VQ= -github.com/vmware-tanzu/carvel-vendir v0.34.7/go.mod h1:l/t6FiXe2qeLqC1VKeRnHeqRyNIABVmqBPxgPA9zef8= +github.com/vmware-tanzu/carvel-imgpkg v0.37.8 h1:OTzYdgKcxB8g0kFPlNTXTFlr/+2Hz3U5lxMM4UVjYRs= +github.com/vmware-tanzu/carvel-imgpkg v0.37.8/go.mod h1:Lzr4hzEkVBO3ks/6UyilNesXg5VsrhCf6rw94xd8KCQ= +github.com/vmware-tanzu/carvel-vendir v0.34.9 h1:g+HP38rEru48rnNA4mM5r+DdkC6jQU6OL5W2IVr7Cho= +github.com/vmware-tanzu/carvel-vendir v0.34.9/go.mod h1:KpZgfzpPIt6TUp7kUq+RCDplvirxar7rA8F8UDX7Iss= 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.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= diff --git a/vendor/modules.txt b/vendor/modules.txt index 9641d805..21055358 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -142,10 +142,10 @@ 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.37.6 +# github.com/vmware-tanzu/carvel-imgpkg v0.37.8 ## explicit; go 1.20 github.com/vmware-tanzu/carvel-imgpkg/pkg/imgpkg/lockconfig -# github.com/vmware-tanzu/carvel-vendir v0.34.7 +# github.com/vmware-tanzu/carvel-vendir v0.34.9 ## explicit; go 1.20 github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1