From 5292e493df1a7af46c0501f9146a6f792eb06ee2 Mon Sep 17 00:00:00 2001 From: Jeremy Daer Date: Wed, 21 Oct 2026 11:06:25 -0700 Subject: [PATCH] Move Ruby to 3.4 and the flake to today's nixpkgs-unstable nixpkgs-unstable has removed ruby_3_3 ("ruby_3_3 has been removed, as it will reach end-of-life upstream during Nixpkgs 26.11's support cycle"), so the dev shell no longer evaluates on a current lock; that is why #932 left flake.lock on August's nixpkgs. The Ruby pins have to agree, because make check compiles the skill-eval patterns under Ruby's own regex engine: .mise.toml, both ruby/setup-ruby inputs in test.yml, and the dev shell in flake.nix all move to 3.4, along with the requirement line in CONTRIBUTING.md. flake.lock moves nixpkgs from c27cdad4 (2026-08-27) to 5adc5083 (2026-10-20), taking the Nix build from Go 1.26.7 to 1.26.9. vendorHash is unchanged. go.mod's toolchain line asks for 1.26.10, which nixpkgs master has and unstable doesn't yet; buildGoModule builds with the Go it is given, so a later flake.lock bump takes Nix to 1.26.10 once unstable has it. --- .github/workflows/test.yml | 4 ++-- .mise.toml | 2 +- CONTRIBUTING.md | 2 +- flake.lock | 6 +++--- flake.nix | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6e92b044b..2a7801990 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -353,7 +353,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@e81a8fa391b11a595c1b7ed84177cc0fe02faf83 # v1.328.0 with: - ruby-version: '3.3' + ruby-version: '3.4' - name: Compile the skill-eval patterns run: make check-eval-patterns @@ -494,7 +494,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@e81a8fa391b11a595c1b7ed84177cc0fe02faf83 # v1.328.0 with: - ruby-version: '3.3' + ruby-version: '3.4' - name: Run skill evals env: diff --git a/.mise.toml b/.mise.toml index e27c26e44..36cfa4aa6 100644 --- a/.mise.toml +++ b/.mise.toml @@ -17,4 +17,4 @@ zizmor = "1.30.0" # .github/workflows/test.yml. make check compiles the skill-eval patterns under # Ruby's own regex engine, so bin/ci needs the same Ruby CI uses — a different # engine would answer a different question. -ruby = "3.3" +ruby = "3.4" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7b29bb7e4..91db450ad 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,7 +41,7 @@ The `go.work` file is gitignored - your local setup won't affect the repo. - [bats-core](https://github.com/bats-core/bats-core) for integration tests - [golangci-lint](https://golangci-lint.run/) for linting - [jq](https://jqlang.github.io/jq/) for CLI surface checks -- Ruby 3.3 for the skill-eval pattern check, which compiles those patterns +- Ruby 3.4 for the skill-eval pattern check, which compiles those patterns under the same engine the eval runner uses ## Pull Request Process diff --git a/flake.lock b/flake.lock index a682097d9..fba2492bf 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1787814960, - "narHash": "sha256-PYZq1qzCJXC2zGI0mH07vrZBsw6DRBAOX0jN1pPtqOQ=", + "lastModified": 1792506237, + "narHash": "sha256-Q/8KLB6jNfpaUN1HAedE/u/Et9feE/zYSsutBLKrCFk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c27cdad491a991b11ed731760aa2ef8db0cb0410", + "rev": "5adc50831c259f87faeb09ddf930d43597197473", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 685a583c5..bbe2b620e 100644 --- a/flake.nix +++ b/flake.nix @@ -41,7 +41,7 @@ # Keep in sync with .mise.toml and the ruby/setup-ruby pins in # .github/workflows/test.yml: make check compiles the skill-eval # patterns under Ruby's own regex engine. - ruby_3_3 + ruby_3_4 zizmor ]; };