Skip to content

Conversation

zhassan-aws
Copy link
Contributor

@zhassan-aws zhassan-aws commented Mar 26, 2025

This PR is for testing CI with a version that uses the stable 1.85.1 release with RUSTC_BOOTSTRAP=1 instead of the nightly channel.

The base commit is bc134ce, which is the latest Kani commit that works with 1.85.1.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.

@github-actions github-actions bot added the Z-EndToEndBenchCI Tag a PR to run benchmark CI label Mar 26, 2025
@zhassan-aws zhassan-aws marked this pull request as ready for review March 26, 2025 07:19
@zhassan-aws zhassan-aws requested a review from a team as a code owner March 26, 2025 07:19
@zhassan-aws zhassan-aws marked this pull request as draft March 26, 2025 07:20
@zhassan-aws
Copy link
Contributor Author

zhassan-aws commented Mar 26, 2025

I'm likely going to open a PR to merge the second commit (a491cd0) in main.

EDIT: Done in #3962

Copy link
Member

@tautschnig tautschnig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! Can we try to get even more of those commits into main as indicated in my comments?

@zhassan-aws
Copy link
Contributor Author

Thanks for taking a look @tautschnig! I'll check which of the changes can be committed in main. Note that the changes will still need to be made in the branch as well even if we merge them in main since the branch is created from a 2-months-old commit (bc134ce). Once the branch catches up with those changes in main, the diffs will become fewer.

@tautschnig
Copy link
Member

Thanks for taking a look @tautschnig! I'll check which of the changes can be committed in main. Note that the changes will still need to be made in the branch as well even if we merge them in main since the branch is created from a 2-months-old commit (bc134ce). Once the branch catches up with those changes in main, the diffs will become fewer.

Yes, I made my comments with the idea that it'd be great to keep the diff to a minimum.

@zhassan-aws
Copy link
Contributor Author

Opened #3964 to make the suggested changes in main.

Copy link
Contributor

@carolynzech carolynzech left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

github-merge-queue bot pushed a commit that referenced this pull request Mar 28, 2025
As discussed in #3960, applying changes needed for the stable branch in
main to minimize the differences between the two branches.

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 and MIT licenses.

---------

Co-authored-by: Michael Tautschnig <[email protected]>
Co-authored-by: Carolyn Zech <[email protected]>
@zhassan-aws
Copy link
Contributor Author

This was pushed into the stable branch. Closing.

@zhassan-aws zhassan-aws closed this Apr 4, 2025
@zhassan-aws zhassan-aws deleted the stable-rust branch April 4, 2025 17:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Z-EndToEndBenchCI Tag a PR to run benchmark CI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants