Skip to content

Commit 57c7f0a

Browse files
prestistdustymabe
authored andcommitted
lints: bump to golintcli to 1.64.4 on go 1.24
address new lints imposed by go 1.24
1 parent 8e16f5f commit 57c7f0a

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

.github/workflows/lints.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
steps:
2929
- uses: actions/setup-go@v4
3030
with:
31-
go-version: 1.21
31+
go-version: 1.24
3232
- uses: actions/checkout@v3
3333
- name: golangci-lint
3434
uses: golangci/golangci-lint-action@v3
3535
with:
36-
version: v1.55.1
36+
version: v1.64.4
3737
args: --timeout=5m

mantle/cmd/ore/azure/delete-blob.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func runDeleteBlob(cmd *cobra.Command, args []string) {
5252
if err != nil {
5353
plog.Fatalf("Fetching storage service keys failed: %v", err)
5454
}
55-
if kr.Keys == nil || len(kr.Keys) == 0 {
55+
if len(kr.Keys) == 0 {
5656
plog.Fatalf("No storage service keys found")
5757
}
5858
k := kr.Keys

mantle/cmd/ore/azure/upload-blob.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func runUploadBlob(cmd *cobra.Command, args []string) {
8686
if err != nil {
8787
plog.Fatalf("Fetching storage service keys failed: %v", err)
8888
}
89-
if kr.Keys == nil || len(kr.Keys) == 0 {
89+
if len(kr.Keys) == 0 {
9090
plog.Fatalf("No storage service keys found")
9191
}
9292
k := kr.Keys

mantle/kola/tests/ignition/kdump.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ kernel_arguments:
189189
if err != nil {
190190
return err
191191
} else if string(kdump_status) == "inactive" {
192-
return fmt.Errorf(fmt.Sprintf("Kdump.service is not ready: %s.", string(kdump_status)))
192+
return fmt.Errorf("kdump.service is not ready: %s", string(kdump_status))
193193
}
194194
return nil
195195
})

mantle/kola/tests/misc/network.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,8 @@ func checkExpectedInterfacesStatus(c cluster.TestCluster, m platform.Machine, ma
612612
}
613613

614614
if len(failedConnections) != 0 {
615-
return fmt.Errorf(strings.Join(failedConnections, ","))
615+
failed := strings.Join(failedConnections, ",")
616+
return fmt.Errorf("failed connections: %s", failed)
616617
}
617618
return nil
618619
}
@@ -642,7 +643,8 @@ func checkExpectedInterfacesIPAddress(c cluster.TestCluster, m platform.Machine,
642643
}
643644

644645
if len(failedConnections) != 0 {
645-
return fmt.Errorf(strings.Join(failedConnections, ","))
646+
failed := strings.Join(failedConnections, ",")
647+
return fmt.Errorf("failed connections: %s", failed)
646648
}
647649
return nil
648650
}

0 commit comments

Comments
 (0)