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.

Sign up for GitHub

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

Jump to bottom

Switch to go 1.23 #1573

Merged
merged 1 commit into from
Aug 16, 2024
Merged

Switch to go 1.23 #1573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
cache: false

- name: Set env
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
cache: false

- name: Set env
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/containerd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
cache: false

- name: Set env
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/crio.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Install go
uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'

- name: Setup system
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-go@v5
with:
go-version: '1.22'
go-version: '1.23'
- run: make release-notes release
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ install.lint: $(GOLANGCI_LINT)

$(GOLANGCI_LINT):
export \
VERSION=v1.59.1 \
VERSION=v1.60.1 \
URL=https://raw.githubusercontent.com/golangci/golangci-lint \
BINDIR=${BUILD_BIN_PATH} && \
curl -sfL $$URL/$$VERSION/install.sh | sh -s $$VERSION
Expand Down
4 changes: 1 addition & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module sigs.k8s.io/cri-tools

go 1.22.0

toolchain go1.22.1
go 1.23.0

require (
github.com/distribution/reference v0.6.0
Expand Down
4 changes: 2 additions & 2 deletions pkg/common/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func WriteConfig(c *Config, filepath string) error {
func getConfigOptions(yamlData *yaml.Node) (*Config, error) {
config := &Config{yamlData: yamlData}

if yamlData.Content == nil || len(yamlData.Content) == 0 ||
if len(yamlData.Content) == 0 ||
yamlData.Content[0].Content == nil {
return config, nil
}
Expand Down Expand Up @@ -142,7 +142,7 @@ func setConfigOptions(config *Config) {

// Set config option on yaml.
func setConfigOption(configName, configValue string, yamlData *yaml.Node) {
if yamlData.Content == nil || len(yamlData.Content) == 0 {
if len(yamlData.Content) == 0 {
yamlData.Kind = yaml.DocumentNode
yamlData.Content = make([]*yaml.Node, 1)
yamlData.Content[0] = &yaml.Node{
Expand Down
Loading