diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 50a40d1..82664f9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,8 +5,8 @@ on: push: branches-ignore: [main] env: - GO_VERSION: '1.26.0' - GOLANGCI_LINT_VERSION: 'v2.10.1' + GO_VERSION: '1.26.1' + GOLANGCI_LINT_VERSION: 'v2.11.4' jobs: # Check if there is any dirty change for go mod tidy go-mod: @@ -59,7 +59,7 @@ jobs: name: go_work path: go.work - id: set-modules - run: echo "modules=$(go list -m -json | jq -s '.' | jq -c '[.[].Dir]')" >> $GITHUB_OUTPUT + run: echo "modules=$(go work edit -json | jq -c '[.Use[].DiskPath]')" >> $GITHUB_OUTPUT go-mod-examples: needs: [detect-modules] runs-on: ubuntu-latest diff --git a/Makefile b/Makefile index 739649c..77dc2f4 100644 --- a/Makefile +++ b/Makefile @@ -60,8 +60,8 @@ YQ = $(LOCALBIN)/yq ## TODO: remap in yaml file (version.yaml or smthng) ## Tool Versions # GO_BUILDER_VERSION must be without 'v' prefix -GO_BUILDER_VERSION = 1.25.5 -GOLANGCI_LINT_VERSION = v2.10.1 +GO_BUILDER_VERSION = 1.26.1 +GOLANGCI_LINT_VERSION = v2.11.4 YQ_VERSION ?= v4.50.1 diff --git a/examples/basic-example-module/hooks/go.mod b/examples/basic-example-module/hooks/go.mod index 3423b3c..2cb360c 100644 --- a/examples/basic-example-module/hooks/go.mod +++ b/examples/basic-example-module/hooks/go.mod @@ -1,6 +1,6 @@ module basic-example-module -go 1.24.0 +go 1.25.8 require github.com/deckhouse/module-sdk v0.0.0 diff --git a/examples/common-hooks/tls-certificate/hooks/go.mod b/examples/common-hooks/tls-certificate/hooks/go.mod index aa52bdb..71dc430 100644 --- a/examples/common-hooks/tls-certificate/hooks/go.mod +++ b/examples/common-hooks/tls-certificate/hooks/go.mod @@ -1,6 +1,6 @@ module tlscertificate -go 1.24.0 +go 1.25.8 require github.com/deckhouse/module-sdk v0.0.0 diff --git a/examples/dependency-example-module/hooks/go.mod b/examples/dependency-example-module/hooks/go.mod index 70b3b3a..66c825d 100644 --- a/examples/dependency-example-module/hooks/go.mod +++ b/examples/dependency-example-module/hooks/go.mod @@ -1,6 +1,6 @@ module dependency-example-module -go 1.24.0 +go 1.25.8 require ( github.com/deckhouse/deckhouse/pkg/log v0.2.0 diff --git a/examples/example-module/hooks/go.mod b/examples/example-module/hooks/go.mod index ee36421..59dbcfe 100644 --- a/examples/example-module/hooks/go.mod +++ b/examples/example-module/hooks/go.mod @@ -1,6 +1,6 @@ module example-module -go 1.24.0 +go 1.25.8 require ( github.com/deckhouse/deckhouse/pkg/log v0.2.0 diff --git a/examples/settings-check/hooks/go.mod b/examples/settings-check/hooks/go.mod index e799c55..8e1f530 100644 --- a/examples/settings-check/hooks/go.mod +++ b/examples/settings-check/hooks/go.mod @@ -1,6 +1,6 @@ module valuescheck -go 1.24.0 +go 1.25.8 require github.com/deckhouse/module-sdk v0.0.0 diff --git a/examples/single-file-app-example/hooks/go.mod b/examples/single-file-app-example/hooks/go.mod index a50006e..811c7a1 100644 --- a/examples/single-file-app-example/hooks/go.mod +++ b/examples/single-file-app-example/hooks/go.mod @@ -1,6 +1,6 @@ -module singlefileexample +module singlefileappexample -go 1.24.0 +go 1.25.8 require ( github.com/deckhouse/deckhouse/pkg/log v0.2.0 diff --git a/examples/single-file-app-example/hooks/main_test.go b/examples/single-file-app-example/hooks/main_test.go index 8fc9e9f..2593e7e 100644 --- a/examples/single-file-app-example/hooks/main_test.go +++ b/examples/single-file-app-example/hooks/main_test.go @@ -11,7 +11,7 @@ import ( "github.com/deckhouse/module-sdk/pkg" "github.com/deckhouse/module-sdk/testing/mock" - singlefileexample "singlefileexample" + singlefileappexample "singlefileappexample" ) const ( @@ -21,7 +21,7 @@ const ( var _ = Describe("handle hook single file example", func() { snapshots := mock.NewSnapshotsMock(GinkgoT()) - snapshots.GetMock.When(singlefileexample.SnapshotKey).Then( + snapshots.GetMock.When(singlefileappexample.SnapshotKey).Then( []pkg.Snapshot{ mock.NewSnapshotMock(GinkgoT()).UnmarshalToMock.Set(func(v any) error { str := v.(*string) @@ -49,7 +49,7 @@ var _ = Describe("handle hook single file example", func() { Context("reconcile func", func() { It("reconcile func executed correctly", func() { - err := singlefileexample.Handle(context.Background(), input) + err := singlefileappexample.Handle(context.Background(), input) Expect(err).ShouldNot(HaveOccurred()) }) }) diff --git a/examples/single-file-example/hooks/go.mod b/examples/single-file-example/hooks/go.mod index a50006e..e30676a 100644 --- a/examples/single-file-example/hooks/go.mod +++ b/examples/single-file-example/hooks/go.mod @@ -1,6 +1,6 @@ module singlefileexample -go 1.24.0 +go 1.25.8 require ( github.com/deckhouse/deckhouse/pkg/log v0.2.0 diff --git a/go.mod b/go.mod index 6ed11ab..116f0ef 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/deckhouse/module-sdk -go 1.24.0 +go 1.25.8 require ( github.com/caarlos0/env/v11 v11.3.1