Skip to content

Commit

Permalink
Merge pull request #781 from vmware-tanzu/bumpgo_v0.44.0
Browse files Browse the repository at this point in the history
Bump go to 1.19.3 and fix CVEs in v0.44.0
  • Loading branch information
pivotaljohn authored Dec 6, 2022
2 parents 09be3d5 + ec065fe commit 2053908
Show file tree
Hide file tree
Showing 21 changed files with 224 additions and 997 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ jobs:
name: lint
runs-on: ubuntu-latest
steps:
- name: Install Go 1.17
- name: Install Go 1.19.3
uses: actions/setup-go@v3
with:
go-version: "1.17"
go-version: "1.19.3"
- uses: actions/checkout@v2
with:
fetch-depth: '0'
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.45.2
version: v1.50.1
args: -v
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
with:
fetch-depth: 0

- name: Install Go 1.17
- name: Install Go 1.19.3
uses: actions/setup-go@v3
with:
go-version: "1.17"
go-version: "1.19.3"

- name: generate website/generate.go
if: startsWith(github.ref, 'refs/tags/')
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
name: Test All
runs-on: ubuntu-latest
steps:
- name: Install Go 1.17
- name: Install Go 1.19.3
uses: actions/setup-go@v3
with:
go-version: "1.17"
go-version: "1.19.3"
- name: Check out code into the Go module directory
uses: actions/checkout@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
name: Test Windows
runs-on: windows-latest
steps:
- name: Install Go 1.17
- name: Install Go 1.19.3
uses: actions/setup-go@v3
with:
go-version: "1.17"
go-version: "1.19.3"
- name: Check out code into the Go module directory
uses: actions/checkout@v2
- name: Run Tests
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: vmware-tanzu/carvel-ytt
tool: ytt
goVersion: "1.17"
goVersion: "1.19.3"
secrets:
githubToken: ${{ secrets.GITHUB_TOKEN }}
slackWebhookURL: ${{ secrets.SLACK_WEBHOOK_URL }}
4 changes: 2 additions & 2 deletions examples/integrating-with-ytt/internal-templating/go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module example_internal_templating

go 1.17
go 1.19

// ensure example works with this copy of ytt; remove before use
replace github.com/vmware-tanzu/carvel-ytt => ../../../

require github.com/vmware-tanzu/carvel-ytt v0.40.1

require (
github.com/hashicorp/go-version v1.4.0 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/k14s/starlark-go v0.0.0-20200720175618-3a5c849cc368 // indirect
)
786 changes: 5 additions & 781 deletions examples/integrating-with-ytt/internal-templating/go.sum

Large diffs are not rendered by default.

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-ytt

go 1.17
go 1.19

require (
github.com/BurntSushi/toml v1.2.1
Expand Down
1 change: 0 additions & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ A cobra.Command is the starting point of execution.
For a list of commands run:
$ ytt help
$ ytt help
The default command is "template".
*/
Expand Down
Loading

0 comments on commit 2053908

Please sign in to comment.