Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forward-merge branch-25.02 into branch-25.04 #449

Merged
merged 3 commits into from
Jan 27, 2025
Merged

Conversation

rapids-bot[bot]
Copy link

@rapids-bot rapids-bot bot commented Jan 27, 2025

Forward-merge triggered by push to branch-25.02 that creates a PR to keep branch-25.04 up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge. See forward-merger docs for more info.

jameslamb and others added 3 commits January 23, 2025 14:16
Contributes to rapidsai/build-planning#33

Adjusts `rapids-build-utils` manifest for release 25.02 to account for
the introduction of new `libcuml` wheels
(rapidsai/cuml#6199).

## Notes for Reviewers

This shouldn't be merged still pointing at my forks.

Plan:

1. merge #440, then update
this branch
2. see CI pass here
3. see all CI except devcontainers pass on
rapidsai/cuml#6199
4. point this PR back at upstream and admin-merge it
5. re-run devcontainers CI on rapidsai/cuml#6199
and see it pass
New packages, new compilers.

Changes how environment is prepared on the container. Skips environment
initialization by embedding the msvc vars into the global env.
@rapids-bot rapids-bot bot requested a review from a team as a code owner January 27, 2025 15:28
@rapids-bot rapids-bot bot requested review from bdice and removed request for a team January 27, 2025 15:28
Copy link
Author

rapids-bot bot commented Jan 27, 2025

FAILURE - Unable to forward-merge due to an error, manual merge is necessary. Do not use the Resolve conflicts option in this PR, follow these instructions https://docs.rapids.ai/maintainers/forward-merger/

IMPORTANT: When merging this PR, do not use the auto-merger (i.e. the /merge comment). Instead, an admin must manually merge by changing the merging strategy to Create a Merge Commit. Otherwise, history will be lost and the branches become incompatible.

@trxcllnt trxcllnt merged commit 9f3f9ba into branch-25.04 Jan 27, 2025
216 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants