Skip to content

Commit

Permalink
Use Go 1.22 (#26)
Browse files Browse the repository at this point in the history
Signed-off-by: Tamal Saha <[email protected]>
  • Loading branch information
tamalsaha authored Apr 10, 2024
1 parent 9a40277 commit 75e412b
Show file tree
Hide file tree
Showing 29 changed files with 499 additions and 198 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
name: Build
runs-on: ubuntu-20.04
steps:
- name: Set up Go 1.20
- name: Set up Go 1.22
uses: actions/setup-go@v1
with:
go-version: '1.20'
go-version: '1.22'
id: go

- uses: actions/checkout@v2
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ BIN_PLATFORMS := $(DOCKER_PLATFORMS)
OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS))
ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))

BASEIMAGE_PROD ?= gcr.io/distroless/static-debian11
BASEIMAGE_DBG ?= debian:bullseye
BASEIMAGE_PROD ?= gcr.io/distroless/static-debian12
BASEIMAGE_DBG ?= debian:bookworm

GO_VERSION ?= 1.20
GO_VERSION ?= 1.22
BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION)

OUTBIN = bin/$(OS)_$(ARCH)/$(BIN)
Expand Down Expand Up @@ -169,7 +169,7 @@ test: $(BUILD_DIRS)
./hack/test.sh $(SRC_DIRS) \
"

ADDTL_LINTERS := goconst,gofmt,goimports,unparam
ADDTL_LINTERS := gofmt,goimports,unparam

.PHONY: lint
lint: $(BUILD_DIRS)
Expand Down
24 changes: 14 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,28 +1,32 @@
module kmodules.xyz/schema-checker

go 1.17
go 1.22.0

toolchain go1.22.2

require (
github.com/gobeam/stringy v0.0.5
github.com/pkg/errors v0.9.1
github.com/yudai/gojsondiff v1.0.0
sigs.k8s.io/yaml v1.3.0
sigs.k8s.io/yaml v1.4.0
)

require (
github.com/fsnotify/fsnotify v1.5.4 // indirect
golang.org/x/sys v0.5.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/nxadm/tail v1.4.11 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
golang.org/x/sys v0.18.0 // indirect
)

require (
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/onsi/gomega v1.19.0 // indirect
github.com/onsi/gomega v1.31.1 // indirect
github.com/sergi/go-diff v1.2.0 // indirect
github.com/stretchr/testify v1.7.0 // indirect
github.com/stretchr/testify v1.9.0 // indirect
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
github.com/yudai/pp v2.0.1+incompatible // indirect
golang.org/x/net v0.7.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
golang.org/x/net v0.23.0 // indirect
)
91 changes: 30 additions & 61 deletions go.sum

Large diffs are not rendered by default.

17 changes: 0 additions & 17 deletions vendor/gopkg.in/yaml.v2/.travis.yml

This file was deleted.

38 changes: 21 additions & 17 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,30 @@
# github.com/fsnotify/fsnotify v1.5.4
## explicit; go 1.16
# github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
## explicit
# github.com/fsnotify/fsnotify v1.7.0
## explicit; go 1.17
# github.com/gobeam/stringy v0.0.5
## explicit; go 1.14
github.com/gobeam/stringy
# github.com/mattn/go-colorable v0.1.12
# github.com/google/go-cmp v0.6.0
## explicit; go 1.13
# github.com/mattn/go-colorable v0.1.13
## explicit; go 1.15
# github.com/nxadm/tail v1.4.11
## explicit; go 1.13
# github.com/onsi/ginkgo v1.16.5
## explicit; go 1.16
# github.com/onsi/gomega v1.19.0
## explicit; go 1.18
# github.com/onsi/gomega v1.31.1
## explicit; go 1.20
# github.com/pkg/errors v0.9.1
## explicit
github.com/pkg/errors
# github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
## explicit
# github.com/sergi/go-diff v1.2.0
## explicit; go 1.12
github.com/sergi/go-diff/diffmatchpatch
# github.com/stretchr/testify v1.7.0
## explicit; go 1.13
# github.com/stretchr/testify v1.9.0
## explicit; go 1.17
# github.com/yudai/gojsondiff v1.0.0
## explicit
github.com/yudai/gojsondiff
Expand All @@ -26,15 +34,11 @@ github.com/yudai/gojsondiff/formatter
github.com/yudai/golcs
# github.com/yudai/pp v2.0.1+incompatible
## explicit
# golang.org/x/net v0.7.0
## explicit; go 1.17
# golang.org/x/sys v0.5.0
## explicit; go 1.17
# gopkg.in/yaml.v2 v2.4.0
## explicit; go 1.15
gopkg.in/yaml.v2
# gopkg.in/yaml.v3 v3.0.1
## explicit
# sigs.k8s.io/yaml v1.3.0
# golang.org/x/net v0.23.0
## explicit; go 1.18
# golang.org/x/sys v0.18.0
## explicit; go 1.18
# sigs.k8s.io/yaml v1.4.0
## explicit; go 1.12
sigs.k8s.io/yaml
sigs.k8s.io/yaml/goyaml.v2
Loading

0 comments on commit 75e412b

Please sign in to comment.