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-0.33 to branch-0.34 #970

Closed
wants to merge 1 commit into from
Closed

Conversation

GPUtester
Copy link
Contributor

Forward-merge triggered by push to branch-0.33 that creates a PR to keep branch-0.34 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.

Moves the wheel build and test logic out of the workflow into the repo. This matches conda tests more closely and allows each repo to manage its own wheels more easily.

Authors:
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Peter Andreas Entschev (https://github.com/pentschev)
  - Ray Douglass (https://github.com/raydouglass)

URL: #969
@GPUtester GPUtester requested a review from a team as a code owner July 24, 2023 20:57
@GPUtester
Copy link
Contributor Author

FAILURE - Unable to forward-merge due to conflicts, 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.

@jakirkham
Copy link
Member

This is also referencing 23.08 when we want 23.10

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