Skip to content

fix: replace Corrosion with pre-built cargo artifact (Neurons-ofq)#41

Merged
dexwritescode merged 1 commit into
mainfrom
fix-corrosion-ofq
May 15, 2026
Merged

fix: replace Corrosion with pre-built cargo artifact (Neurons-ofq)#41
dexwritescode merged 1 commit into
mainfrom
fix-corrosion-ofq

Conversation

@dexwritescode
Copy link
Copy Markdown
Owner

Summary

  • Removes Corrosion from compute/CMakeLists.txt — it was calling rustup show during cmake configure, which failed on macos-26 because the runner's ~/.cargo/bin/rustup is the bootstrap installer, not the toolchain manager
  • Adopts the same pattern used for gRPC: cargo build --release runs as a workflow step before cmake, producing libtokenizers_sys.a; cmake links it as a pre-built IMPORTED STATIC target
  • Removes dtolnay/rust-toolchain and Swatinem/rust-cache actions from build.yml and test.yml; replaces with a single cargo build step + actions/cache on compute/tokenizers-sys/target
  • Adds _tokenizers_sys as a prerequisite of _configure in the Makefile so local make mirrors the CI order

Corrosion was calling rustup show/toolchain during cmake configure,
which failed on the macos-26 CI runner where the rustup binary is
the bootstrap installer rather than the toolchain manager.

Same pattern as gRPC: build libtokenizers_sys.a via a plain
'cargo build --release' step BEFORE cmake runs. CMake links the
pre-built static library directly — no Corrosion, no rustup needed.

- Remove Corrosion FetchContent from compute/CMakeLists.txt
- Add IMPORTED STATIC target pointing at tokenizers-sys/target/release/
- Replace dtolnay/rust-toolchain + Swatinem/rust-cache with a single
  'cargo build' step + artifact cache in build.yml and test.yml
- Wire _tokenizers_sys as a prerequisite of _configure in Makefile
@dexwritescode dexwritescode added the release:skip Skips release creation on merge label May 15, 2026
@dexwritescode dexwritescode merged commit 3445e12 into main May 15, 2026
4 checks passed
@dexwritescode dexwritescode deleted the fix-corrosion-ofq branch May 15, 2026 02:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release:skip Skips release creation on merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant