From 7fb5aaca304d1ba2584239eeccb260a16a40828e Mon Sep 17 00:00:00 2001 From: "smalruby3-editor-bot[bot]" <297607354+smalruby3-editor-bot[bot]@users.noreply.github.com> Date: Wed, 11 Nov 2026 16:12:27 +0000 Subject: [PATCH] ci(smalruby3): build the gem on ubuntu 26.04 by upgrading rb-sys to 0.9.130 magnus failed to compile on 26.04 because rb-sys-build 0.9.124 used bindgen 0.69, which emits rb_data_type_struct as an opaque type (oxidize-rb/rb-sys#712). rb-sys 0.9.125+ uses bindgen 0.72. - Cargo.lock: rb-sys / rb-sys-build 0.9.124 -> 0.9.130, bindgen 0.69.5 -> 0.72.1, rustc-hash 1.1.0 -> 2.1.3, magnus 0.8.2 -> 0.8.4, drop lazycell - move ci-ruby unit-test, gem-build-check build-linux, release-gem test/release to ubuntu-26.04 - docs/maintenance/ci-runners.md: drop the 24.04 exception Closes #1391 Co-Authored-By: Claude Opus 5.5 --- .github/workflows/ci-ruby.yml | 2 +- .github/workflows/gem-build-check.yml | 2 +- .github/workflows/release-gem.yml | 6 ++-- docs/maintenance/ci-runners.md | 6 ++-- .../ext/smalruby3_imageutil/Cargo.lock | 28 +++++++------------ 5 files changed, 16 insertions(+), 28 deletions(-) diff --git a/.github/workflows/ci-ruby.yml b/.github/workflows/ci-ruby.yml index d48f30e0368..722e22df8bb 100644 --- a/.github/workflows/ci-ruby.yml +++ b/.github/workflows/ci-ruby.yml @@ -40,7 +40,7 @@ jobs: unit-test: name: "[smalruby3] Unit Tests (Ruby ${{ matrix.ruby }})" - runs-on: ubuntu-24.04 # magnus does not compile on 26.04 (#1391) + runs-on: ubuntu-26.04 strategy: fail-fast: false matrix: diff --git a/.github/workflows/gem-build-check.yml b/.github/workflows/gem-build-check.yml index 5e9c5c0398b..432e214ba40 100644 --- a/.github/workflows/gem-build-check.yml +++ b/.github/workflows/gem-build-check.yml @@ -23,7 +23,7 @@ permissions: jobs: build-linux: name: "Build gem (Linux / Ruby ${{ inputs.ruby-version || '3.4' }})" - runs-on: ubuntu-24.04 # magnus does not compile on 26.04 (#1391) + runs-on: ubuntu-26.04 defaults: run: working-directory: ruby/smalruby3 diff --git a/.github/workflows/release-gem.yml b/.github/workflows/release-gem.yml index d8de3204892..f376722326b 100644 --- a/.github/workflows/release-gem.yml +++ b/.github/workflows/release-gem.yml @@ -12,7 +12,7 @@ permissions: jobs: test: name: "[smalruby3] Test before release" - runs-on: ubuntu-24.04 # magnus does not compile on 26.04 (#1391) + runs-on: ubuntu-26.04 strategy: fail-fast: false matrix: @@ -47,9 +47,7 @@ jobs: release: name: "[smalruby3] Publish to RubyGems" needs: test - # Does not compile the native extensions (source gem only), but publish from the same - # image as `test`: this job runs only on a tag push, so 26.04 cannot be checked beforehand. - runs-on: ubuntu-24.04 # same image as `test` (#1391) + runs-on: ubuntu-26.04 environment: rubygems defaults: run: diff --git a/docs/maintenance/ci-runners.md b/docs/maintenance/ci-runners.md index 5fee3245882..7d7ec7a6502 100644 --- a/docs/maintenance/ci-runners.md +++ b/docs/maintenance/ci-runners.md @@ -11,10 +11,8 @@ GitHub Actions の runner(`runs-on`)は **版を固定する**。`ubuntu-lat ## 例外(古い版に残しているジョブ) -| ジョブ | 版 | 理由 | 追跡 | -|---|---|---|---| -| `ci-ruby.yml` の `unit-test`、`gem-build-check.yml` の `build-linux`、`release-gem.yml` の `test` | `ubuntu-24.04` | smalruby3 gem のネイティブ拡張が使う `magnus` が 26.04 ではコンパイルできない(新しい libclang と `bindgen` 0.69 の組み合わせ) | #1391 | -| `release-gem.yml` の `release` | `ubuntu-24.04` | ネイティブ拡張はコンパイルしない(ソース gem を作って公開するだけ)。ただしタグ push でしか走らず 26.04 で事前に確かめられないので、`test` と同じ版で出す。`test` を 26.04 に上げるときに一緒に上げる | #1391 | +いまは無い(全ジョブが上の表の label で動く)。古い版に残すジョブができたら、ここに +「ジョブ / 版 / 理由 / 追跡 Issue」の表を作って載せる。 ## なぜ固定するか diff --git a/ruby/smalruby3/ext/smalruby3_imageutil/Cargo.lock b/ruby/smalruby3/ext/smalruby3_imageutil/Cargo.lock index 06a14e21c92..54a5a1d414a 100644 --- a/ruby/smalruby3/ext/smalruby3_imageutil/Cargo.lock +++ b/ruby/smalruby3/ext/smalruby3_imageutil/Cargo.lock @@ -49,16 +49,14 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bindgen" -version = "0.69.5" +version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" +checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" dependencies = [ "bitflags 2.11.0", "cexpr", "clang-sys", "itertools", - "lazy_static", - "lazycell", "proc-macro2", "quote", "regex", @@ -354,12 +352,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "leb128fmt" version = "0.1.0" @@ -402,9 +394,9 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "magnus" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b36a5b126bbe97eb0d02d07acfeb327036c6319fd816139a49824a83b7f9012" +checksum = "e76237a607e1dea288dd0ef0c6c8f49037df2152d14bb52b3542c46522d9e6fc" dependencies = [ "magnus-macros", "rb-sys", @@ -540,18 +532,18 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "rb-sys" -version = "0.9.124" +version = "0.9.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85c4188462601e2aa1469def389c17228566f82ea72f137ed096f21591bc489" +checksum = "02faf625bb10ba893e3ae620f19c9fb1b5f8fcae0fe4eb86bb3f2230fad75edb" dependencies = [ "rb-sys-build", ] [[package]] name = "rb-sys-build" -version = "0.9.124" +version = "0.9.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568068db4102230882e6d4ae8de6632e224ca75fe5970f6e026a04e91ed635d3" +checksum = "05be6f9c86fe5482808162826f6c047d093b3670582296c770de1d94f8066694" dependencies = [ "bindgen", "lazy_static", @@ -631,9 +623,9 @@ checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d" [[package]] name = "rustix"