Repository navigation
[58_maintenance] Fix CI: check in Cargo.lock for MSRV, backport rustdoc, MIRI and integration test fixes - #11727
Merged
Merged
Conversation
… in tests (apache#10433) # Which issue does this PR close? No separate issue. The fix is one line per test case and the failing CI runs are evidence enough. # Rationale for this change MIRI CI uses nightly Rust. A recent nightly changed the `Display` output of `TryFromIntError` from `"out of range integral type conversion attempted"` to `"number too large to fit in target type"` (and similar variants). Tests in `datatype_parse.rs` were asserting on that stdlib-owned suffix, so they broke on MIRI without any change to our code. # What changes are included in this PR? Trimmed 9 expected substrings in `parse_data_type_errors` to stop at the `:` that separates our message from the stdlib one. The tests now only assert on the part of the error string we control. # Are these changes tested? `parse_data_type_errors` passes on stable. MIRI CI should go green once this merges. # Are there any user-facing changes? No. Test-only change, no behavior or API impact. (cherry picked from commit b278c54)
…SON parser (apache#9888) # Which issue does this PR close? Supporting unskipping more types in the Rust IPC/C Data tests for apache/arrow#49910 / apache/arrow#49744 . # Rationale for this change View types and decimal 32/64 are supported in Rust but aren't supported in the integration test JSON implementation (so they fail when the integration test tries to check them). # What changes are included in this PR? Integration test JSON now supports how these values are represented. # Are these changes tested? Yes. I've added to the embedded integration.json for the new types and I've run the apache/arrow PR against this branch with these types no longer being skipped. # Are there any user-facing changes? No --------- Co-authored-by: Copilot <copilot@github.com> (cherry picked from commit 2e8e0c7)
…he#11305) (apache#11354) - Backport apache#11305 - For inclusion in apache#11352 Cherry-pick of apache@79ffb47 with minor conflict fixes So we can get green CI on 59_maintenance branch Signed-off-by: Jiawei Zhao <Phoenix500526@163.com> Co-authored-by: Phoenix <Phoenix500526@163.com> (cherry picked from commit 0336b2b)
Like apache#9941 on main, commit the root Cargo.lock so the MSRV job verifies against a dependency set compatible with Rust 1.85 (tonic 0.14.5, uuid 1.26.1) instead of the newest published versions. Remove the manual dependency downgrade step from the MSRV workflow since the lockfile now covers it. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
4 of 5 tasks
alamb
commented
Oct 19, 2026
| - name: Install cargo-msrv (if needed) | ||
| # cargo-msrv binary may be cached by the cargo cache step in setup-builder, and cargo install will error if it is already installed | ||
| run: if which cargo-msrv ; then echo "using existing cargo-msrv binary" ; else cargo install cargo-msrv --locked ; fi | ||
| - name: Downgrade workspace dependencies |
Contributor
Author
There was a problem hiding this comment.
This PR checks in Cargo.lock instead
| version = { workspace = true } | ||
| description = "Arrow arithmetic kernels" | ||
| homepage = { workspace = true } | ||
| repository = { workspace = true } |
Contributor
Author
There was a problem hiding this comment.
Needed to fix errors like https://github.com/apache/arrow-rs/actions/runs/39238804526/job/118014357492?pr=11365
Run cargo +nightly doc --document-private-items --no-deps --workspace --all-features
warning: `package.homepage` is redundant with `package.repository`
--> parquet-variant/Cargo.toml:23:12
|
23 | homepage = { workspace = true }
| ^^^^^^^^^^^^^^^^^^^^
24 | repository = { workspace = true }
| --------------------
|| //! This module exposes three layers of the API surface, from highest to lowest-level: | ||
| //! | ||
| //! * [`ReaderBuilder`](crate::reader::ReaderBuilder): configures how Avro is read (batch size, strict union handling, | ||
| //! * [`ReaderBuilder`]: configures how Avro is read (batch size, strict union handling, |
Contributor
Author
There was a problem hiding this comment.
Fixes https://github.com/apache/arrow-rs/actions/runs/39238804526/job/118014357492?pr=11365
error: redundant explicit link target
|
= note: when a link's destination is not specified,
the label is used to resolve intra-doc links
= note: `-D rustdoc::redundant-explicit-links` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(rustdoc::redundant_explicit_links)]`
error: redundant explicit link target
|
= note: when a link's destination is not specified,
the label is used to resolve intra-doc links
| "children": [] | ||
| } | ||
| ] | ||
| }, |
Contributor
Author
There was a problem hiding this comment.
| ( | ||
| "FixedSizeBinary(4000000000), ", | ||
| "Error converting 4000000000 into i32 for FixedSizeBinary: out of range integral type conversion attempted", | ||
| "Error converting 4000000000 into i32 for FixedSizeBinary:", |
Contributor
Author
There was a problem hiding this comment.
Contributor
Author
|
This PR looks massive but I think it is pretty straightforward |
alamb
marked this pull request as ready for review
October 19, 2026 19:33
Jefffrey
approved these changes
Oct 21, 2026
Contributor
Author
|
Thanks @Jefffrey -- I am sorry I didn't get more backports done (I was fighting CI failures, and the fact that worker queues limited turnaround to many hours) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
58.4.1(October 2026) #11665 (58.4.1 release)Rationale for this change
CI on the 58_maintenance branch is red on every PR (e.g. #11365, #11703, #11704, #11705, #11707) for reasons unrelated to those PRs.
What changes are included in this PR?
Cargo.lock, the same approach as Fix MSRV check by checking in Cargo.lock #9941homepageentries and let rustdoc infer the targets of fivearrow-avrointra-doc links.TryFromIntErrormessage in thearrow-schematests.ListView,BinaryViewandRunEndEncodedin the integration test JSON parser.Are these changes tested?
Yes by CI
Are there any user-facing changes?
No.