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

Bump go 1.20.5 in line 0.35.x #386

Merged
merged 3 commits into from
Jun 15, 2023
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: "1.19.6"
go-version: "1.20.5"
- uses: actions/checkout@v2
with:
fetch-depth: '0'
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v3.4.0
with:
version: v1.50.1
version: v1.52.2
args: -v

6 changes: 5 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.19.6
go-version: 1.20.5
- name: Retrieve version
run: |
echo "TAG_NAME=$(echo ${{ github.ref }} | grep -Eo 'v[0-9].*')" >> $GITHUB_OUTPUT
id: version

- name: Run GoReleaser
# GoReleaser v2.5.0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-gh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ jobs:
environment: DockerHub E2E
steps:
- name: Set up Go 1.x
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: "1.19.6"
go-version: "1.20.5"
- name: Check out code into the Go module directory
uses: actions/checkout@v3
uses: actions/checkout@v3.3.0
with:
path: src/github.com/${{ github.repository }}
fetch-depth: 0
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/kbld
tool: kbld
goVersion: 1.19.6
goVersion: 1.20.5
secrets:
githubToken: ${{ secrets.GITHUB_TOKEN }}
slackWebhookURL: ${{ secrets.SLACK_WEBHOOK_URL }}
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/vmware-tanzu/carvel-kbld

go 1.19
go 1.20

require (
github.com/cppforlife/cobrautil v0.0.0-20200514214827-bb86e6965d72
Expand Down
4 changes: 2 additions & 2 deletions hack/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM golang:1.19
FROM golang:1.20

RUN apt-get update -y
RUN apt-get install docker.io apt-transport-https ca-certificates gnupg python -y
RUN apt-get install docker.io apt-transport-https ca-certificates gnupg python-is-python3 -y
joaopapereira marked this conversation as resolved.
Show resolved Hide resolved

RUN mkdir -p ~/.docker/cli-plugins/
RUN curl -sLo ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.8.2/buildx-v0.8.2.linux-amd64
Expand Down
2 changes: 1 addition & 1 deletion pkg/kbld/cmd/resolve.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ func (o *ResolveOptions) resolveImages(imageURLs *UnprocessedImageURLs, imgFacto

func (o *ResolveOptions) updateRefsInResources(nonConfigRs []ctlres.Resource,
conf ctlconf.Conf, resolvedImages *ProcessedImages,
imgFactory ctlimg.Factory) ([][]byte, error) {
_ ctlimg.Factory) ([][]byte, error) {

var errs []error
var resBss [][]byte
Expand Down
2 changes: 1 addition & 1 deletion pkg/kbld/search/image_refs.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ type tmpRefMatcher struct {

var _ Matcher = tmpRefMatcher{}

func (m tmpRefMatcher) Matches(key ctlres.Path, value interface{}) (bool, ctlconf.SearchRuleUpdateStrategy) {
func (m tmpRefMatcher) Matches(_ ctlres.Path, value interface{}) (bool, ctlconf.SearchRuleUpdateStrategy) {
if valStr, ok := value.(string); ok {
return strings.HasPrefix(valStr, m.prefix), (ctlconf.SearchRule{}).UpdateStrategyWithDefaults()
}
Expand Down
4 changes: 2 additions & 2 deletions vendor/golang.org/x/sync/errgroup/errgroup.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 2 additions & 13 deletions vendor/golang.org/x/tools/go/analysis/analysis.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/golang.org/x/tools/go/analysis/diagnostic.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 12 additions & 9 deletions vendor/golang.org/x/tools/go/analysis/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 21 additions & 11 deletions vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading