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

[gpuCI] Forward-merge branch-22.04 to branch-22.06 [skip gpuci] #2149

Merged
merged 2 commits into from
Mar 23, 2022

Conversation

GPUtester
Copy link
Contributor

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

Pin changes to be in-line with: rapidsai/cudf#10481

Authors:
  - GALI PREM SAGAR (https://github.com/galipremsagar)

Approvers:
  - AJ Schmidt (https://github.com/ajschmidt8)

URL: #2147
@GPUtester GPUtester requested a review from a team as a code owner March 23, 2022 14:07
@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/gpuci/#forward-mergers
IMPORTANT: Before merging and approving this PR, be sure to change the merging strategy to Create a Merge Commit. Otherwise, history will be lost and the branches become incompatible.

I recently committed a config file to be used by the [rapidsai/ops-bot](https://github.com/rapidsai/ops-bot/) and in hindsight, I should've had the new `external_contributors` functionality set to `false` until we're ready to roll it out everywhere. This PR fixes that.

Authors:
   - AJ Schmidt (https://github.com/ajschmidt8)

Approvers:
@ajschmidt8 ajschmidt8 merged commit 17fd7bb into branch-22.06 Mar 23, 2022
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