Skip to content

Commit

Permalink
Merge pull request #128 from blackpiglet/release-1.5
Browse files Browse the repository at this point in the history
Bump up Golang version.
  • Loading branch information
danfengliu committed Feb 21, 2023
2 parents 184e160 + c3c2416 commit a1cd674
Show file tree
Hide file tree
Showing 8 changed files with 105 additions and 31 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ jobs:
runs-on: ubuntu-latest
steps:

- name: Set up Go 1.18.8
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.18.8
go-version: 1.18.10
id: go

- name: Check out the code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.18.8
go-version: 1.18.10
id: go

- name: Check out code into the Go module directory
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM --platform=$BUILDPLATFORM golang:1.18.8-bullseye AS build
FROM --platform=$BUILDPLATFORM golang:1.18.10-bullseye AS build

ARG TARGETOS
ARG TARGETARCH
Expand Down
4 changes: 4 additions & 0 deletions changelogs/CHANGELOG-1.5.3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
## All changes

* Bump up Golang version. (#128, @blackpiglet)
* Update golang.org/x/net version to address CVE-2022-41721. (#126, @blackpiglet)
1 change: 0 additions & 1 deletion changelogs/unreleased/126-blackpiglet

This file was deleted.

18 changes: 6 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ require (
github.com/spf13/cobra v1.2.1 // indirect
github.com/stretchr/objx v0.2.0 // indirect
go.opencensus.io v0.23.0 // indirect
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
golang.org/x/sys v0.1.0 // indirect
golang.org/x/term v0.1.0 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b // indirect
golang.org/x/net v0.4.0 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/term v0.3.0 // indirect
golang.org/x/text v0.5.0 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.6.7 // indirect
Expand All @@ -72,7 +72,7 @@ require (
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.22.2 // indirect
k8s.io/client-go v0.22.2 // indirect
k8s.io/klog/v2 v2.9.0 // indirect
Expand All @@ -82,9 +82,3 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace (
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b
golang.org/x/net => golang.org/x/net v0.1.1-0.20221104162952-702349b0e862
golang.org/x/text => golang.org/x/text v0.3.8
)
105 changes: 91 additions & 14 deletions go.sum

Large diffs are not rendered by default.

Empty file modified hack/release-tools/changelog.sh
100644 → 100755
Empty file.

0 comments on commit a1cd674

Please sign in to comment.