Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v0.40.x]Bumping golang and dependency version #385

Closed
wants to merge 11 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: 1.21.6
go-version: 1.22.4
- uses: actions/checkout@v2
with:
fetch-depth: '0'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.21.6
go-version: 1.22.4
- name: Set up Cosign
uses: sigstore/cosign-installer@v3
- name: Retrieve version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-gh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v1
with:
go-version: 1.21.6
go-version: 1.22.4
- name: Check out code into the Go module directory
uses: actions/checkout@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trivy-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
with:
repo: carvel-dev/vendir
tool: vendir
goVersion: 1.21.6
goVersion: 1.22.4
secrets:
githubToken: ${{ secrets.GITHUB_TOKEN }}
slackWebhookURL: ${{ secrets.SLACK_WEBHOOK_URL }}
2 changes: 1 addition & 1 deletion cmd/vendir/vendir.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020 VMware, Inc.
// Copyright 2024 The Carvel Authors.
// SPDX-License-Identifier: Apache-2.0

package main
Expand Down
2 changes: 1 addition & 1 deletion code-header-template.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Copyright {{copyright-year}} VMware, Inc.
Copyright {{copyright-year}} The Carvel Authors.
SPDX-License-Identifier: Apache-2.0
4 changes: 2 additions & 2 deletions examples/github-release/vendir.lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ directories:
url: https://api.github.com/repos/cloudfoundry/eirini-release/releases/23064766
path: github.com/cloudfoundry-incubator/eirini-release
- githubRelease:
tag: v1.23.0
url: https://api.github.com/repos/kubernetes/kubernetes/releases/54824547
tag: v1.23.17
url: https://api.github.com/repos/kubernetes/kubernetes/releases/94000681
path: github.com/kubernetes/kubectl
path: vendor
kind: LockConfig
2 changes: 1 addition & 1 deletion examples/github-release/vendir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@ directories:
disableAutoChecksumValidation: true
tagSelection:
semver:
constraints: "~v1.23.x"
constraints: 1.23.x
http:
url: https://dl.k8s.io/release/{tag}/bin/linux/amd64/kubectl
Binary file not shown.
36 changes: 18 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
module carvel.dev/vendir

go 1.21
go 1.22

require (
carvel.dev/imgpkg v0.40.0
carvel.dev/imgpkg v0.42.2
github.com/bmatcuk/doublestar v1.2.1
github.com/carvel-dev/semver/v4 v4.0.1-0.20230221220520-8090ce423695
github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4
github.com/cppforlife/cobrautil v0.0.0-20221021151949-d60711905d65
github.com/cppforlife/go-cli-ui v0.0.0-20220425131040-94f26b16bc14
github.com/gogo/protobuf v1.3.2
github.com/google/go-containerregistry v0.16.1
github.com/google/go-containerregistry v0.19.1
github.com/google/go-github v17.0.0+incompatible
github.com/google/go-querystring v1.1.0 // indirect
github.com/hashicorp/go-version v1.2.1
github.com/mitchellh/go-homedir v1.1.0
github.com/otiai10/copy v1.2.0
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
github.com/spf13/cobra v1.7.0
github.com/stretchr/testify v1.8.4
golang.org/x/crypto v0.17.0
github.com/spf13/cobra v1.8.0
github.com/stretchr/testify v1.9.0
golang.org/x/crypto v0.21.0
golang.org/x/oauth2 v0.8.0
golang.org/x/tools v0.12.0
golang.org/x/tools v0.17.0
gopkg.in/inf.v0 v0.9.1
k8s.io/apimachinery v0.24.3
k8s.io/code-generator v0.17.2
Expand Down Expand Up @@ -54,15 +54,15 @@ require (
github.com/aws/aws-sdk-go-v2/service/sts v1.6.0 // indirect
github.com/aws/smithy-go v1.6.0 // indirect
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20220517224237-e6f29200ae04 // indirect
github.com/cheggaaa/pb/v3 v3.1.4 // indirect
github.com/cheggaaa/pb/v3 v3.1.5 // indirect
github.com/chrismellard/docker-credential-acr-env v0.0.0-20220327082430-c57b701bfc08 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect
github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dimchansky/utfbom v1.1.0 // indirect
github.com/docker/cli v24.0.0+incompatible // indirect
github.com/docker/cli v25.0.5+incompatible // indirect
github.com/docker/distribution v2.8.2+incompatible // indirect
github.com/docker/docker v24.0.7+incompatible // indirect
github.com/docker/docker v25.0.5+incompatible // indirect
github.com/docker/docker-credential-helpers v0.7.0 // indirect
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
github.com/fatih/color v1.15.0 // indirect
Expand All @@ -82,7 +82,7 @@ require (
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/onsi/ginkgo v1.16.4 // indirect
Expand All @@ -96,15 +96,15 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
github.com/vbatts/tar-split v0.11.3 // indirect
github.com/vito/go-interact v1.0.1 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c // indirect
Expand Down
Loading
Loading