From 633822d85c1c995193e5ce802e715032a19622a8 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Wed, 9 Sep 2026 15:47:14 +0200 Subject: [PATCH 1/4] build: update dev env Signed-off-by: Mark Sagi-Kazar --- devenv.lock | 84 +++++++++++++++-------------------------------------- devenv.nix | 2 +- 2 files changed, 24 insertions(+), 62 deletions(-) diff --git a/devenv.lock b/devenv.lock index 74085d4a..f3186073 100644 --- a/devenv.lock +++ b/devenv.lock @@ -3,10 +3,11 @@ "devenv": { "locked": { "dir": "src/modules", - "lastModified": 1760162706, + "lastModified": 1788956372, + "narHash": "sha256-ACop98BNBAWic+KLXd5PBSwzxzMUfEWmefVXDBDFyHQ=", "owner": "cachix", "repo": "devenv", - "rev": "0d5ad578728fe4bce66eb4398b8b1e66deceb4e4", + "rev": "2a399e9ea5e981f225d75b25c8fa8d76f730131d", "type": "github" }, "original": { @@ -16,88 +17,49 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1747046372, - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "git-hooks": { + "nixpkgs": { "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs-src": "nixpkgs-src" }, "locked": { - "lastModified": 1759523803, + "lastModified": 1787753358, + "narHash": "sha256-Tl77VbWyAKrOfRNQhL6JbQtb/MLzbYa/1RG1gWWfICk=", "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835", + "repo": "devenv-nixpkgs", + "rev": "256551e45f6303e142ab4a98be1bf243feb77dc0", "type": "github" }, "original": { "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", + "ref": "rolling", + "repo": "devenv-nixpkgs", "type": "github" } }, - "nixpkgs": { + "nixpkgs-src": { + "flake": false, "locked": { - "lastModified": 1758532697, - "owner": "cachix", - "repo": "devenv-nixpkgs", - "rev": "207a4cb0e1253c7658c6736becc6eb9cace1f25f", + "lastModified": 1787394516, + "narHash": "sha256-pRGOQSClnXNI2iLUG6DYpsGvYcuw0drOutVZFTJNw90=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c8f90650c15282fa8656a041bfbbd2403997a9a7", "type": "github" }, "original": { - "owner": "cachix", - "ref": "rolling", - "repo": "devenv-nixpkgs", + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", "type": "github" } }, "root": { "inputs": { "devenv": "devenv", - "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs", - "pre-commit-hooks": [ - "git-hooks" - ] + "nixpkgs": "nixpkgs" } } }, "root": "root", "version": 7 -} +} \ No newline at end of file diff --git a/devenv.nix b/devenv.nix index 8d86e591..330101d5 100644 --- a/devenv.nix +++ b/devenv.nix @@ -4,7 +4,7 @@ languages = { go = { enable = true; - package = pkgs.go_1_25; + package = pkgs.go_1_27; }; }; From 2a1cfa190aab20a9a38ac08af4e570f14d729032 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Wed, 9 Sep 2026 15:50:52 +0200 Subject: [PATCH 2/4] fix: lint violations Signed-off-by: Mark Sagi-Kazar --- indirect.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indirect.go b/indirect.go index 093345f7..2973c209 100644 --- a/indirect.go +++ b/indirect.go @@ -18,14 +18,14 @@ func indirect(i any) (any, bool) { return nil, false } - if t := reflect.TypeOf(i); t.Kind() != reflect.Ptr { + if t := reflect.TypeOf(i); t.Kind() != reflect.Pointer { // Avoid creating a reflect.Value if it's not a pointer. return i, false } v := reflect.ValueOf(i) - for v.Kind() == reflect.Ptr || (v.Kind() == reflect.Interface && v.Elem().Kind() == reflect.Ptr) { + for v.Kind() == reflect.Pointer || (v.Kind() == reflect.Interface && v.Elem().Kind() == reflect.Pointer) { if v.IsNil() { return nil, true } From 254e85fe935da3ef43815a56089ccf1958e403bb Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Wed, 9 Sep 2026 15:51:04 +0200 Subject: [PATCH 3/4] ci: update versions according to devenv Signed-off-by: Mark Sagi-Kazar --- .github/workflows/ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f1041245..dbb33b2c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,7 +19,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - go: ["1.21", "1.22", "1.23", "1.24", "1.25"] + go: ["1.21", "1.22", "1.23", "1.24", "1.25", "1.26", "1.27"] steps: - name: Checkout repository @@ -44,12 +44,12 @@ jobs: - name: Set up Go uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0 with: - go-version: "1.25" + go-version: "1.27" - name: Lint - uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0 + uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9.3.0 with: - version: v2.4.0 + version: v2.13.1 dependency-review: name: Dependency review From dbbd7cd7a1e6d7b020fda228284428387223aa02 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Wed, 9 Sep 2026 15:58:07 +0200 Subject: [PATCH 4/4] ci: cut the ci matrix Signed-off-by: Mark Sagi-Kazar --- .github/workflows/ci.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index dbb33b2c..a3d0d944 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,14 +11,13 @@ permissions: jobs: test: name: Test - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest strategy: # Fail fast is disabled because there are Go version specific features and tests # that should be able to fail independently. fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] go: ["1.21", "1.22", "1.23", "1.24", "1.25", "1.26", "1.27"] steps: