Skip to content

Commit

Permalink
Merge pull request #191 from Madhu-1/go1.23.0
Browse files Browse the repository at this point in the history
ci: update go version to 1.23.0
  • Loading branch information
Madhu-1 authored Jan 13, 2025
2 parents 711b490 + 3b0bd6c commit 4ec8321
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
uses: golangci/golangci-lint-action@v6
with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
version: v1.55
version: v1.63

# Optional: golangci-lint command line arguments.
args: --config=.golangci.yml
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.22 AS builder
FROM golang:1.23 AS builder
ARG TARGETOS
ARG TARGETARCH

Expand Down
4 changes: 1 addition & 3 deletions api/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/ceph/ceph-csi-operator/api

go 1.22.0

toolchain go1.22.5
go 1.23.0

require (
k8s.io/api v0.30.3
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/ceph/ceph-csi-operator

go 1.22.0

toolchain go1.22.5
go 1.23.0

require (
github.com/ceph/ceph-csi-operator/api v0.0.0-00010101000000-000000000000
Expand Down
5 changes: 4 additions & 1 deletion test/e2e/e2e_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ import (
// Run e2e tests using the Ginkgo runner.
func TestE2E(t *testing.T) {
RegisterFailHandler(Fail)
fmt.Fprintf(GinkgoWriter, "Starting ceph-csi-operator suite\n")
_, err := fmt.Fprintf(GinkgoWriter, "Starting ceph-csi-operator suite\n")
if err != nil {
t.Fatalf("Failed to write to GinkgoWriter: %v", err)
}
RunSpecs(t, "e2e suite")
}
15 changes: 12 additions & 3 deletions test/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ const (
)

func warnError(err error) {
fmt.Fprintf(GinkgoWriter, "warning: %v\n", err)
_, fErr := fmt.Fprintf(GinkgoWriter, "warning: %v\n", err)
if fErr != nil {
panic(fErr)
}
}

// InstallPrometheusOperator installs the prometheus Operator to be used to export the enabled metrics.
Expand All @@ -53,12 +56,18 @@ func Run(cmd *exec.Cmd) ([]byte, error) {
cmd.Dir = dir

if err := os.Chdir(cmd.Dir); err != nil {
fmt.Fprintf(GinkgoWriter, "chdir dir: %s\n", err)
_, fErr := fmt.Fprintf(GinkgoWriter, "chdir dir: %s\n", err)
if fErr != nil {
panic(fErr)
}
}

cmd.Env = append(os.Environ(), "GO111MODULE=on")
command := strings.Join(cmd.Args, " ")
fmt.Fprintf(GinkgoWriter, "running: %s\n", command)
_, err := fmt.Fprintf(GinkgoWriter, "running: %s\n", command)
if err != nil {
return nil, err
}
output, err := cmd.CombinedOutput()
if err != nil {
return output, fmt.Errorf("%s failed with error: (%v) %s", command, err, string(output))
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
## explicit; go 1.11
github.com/beorn7/perks/quantile
# github.com/ceph/ceph-csi-operator/api v0.0.0-00010101000000-000000000000 => ./api
## explicit; go 1.22.0
## explicit; go 1.23.0
github.com/ceph/ceph-csi-operator/api/v1alpha1
# github.com/cespare/xxhash/v2 v2.3.0
## explicit; go 1.11
Expand Down

0 comments on commit 4ec8321

Please sign in to comment.