chore: merge latest rattler main into Azure Blob channel branch - #4
Closed
wolfv wants to merge 22 commits into
Closed
chore: merge latest rattler main into Azure Blob channel branch#4wolfv wants to merge 22 commits into
wolfv wants to merge 22 commits into
Conversation
Co-authored-by: octo-sts[bot] <157150467+octo-sts[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Bas Zalmstra <4995967+baszalmstra@users.noreply.github.com>
# Conflicts: # Cargo.lock # Cargo.toml # crates/rattler-bin/src/commands/client.rs # py-rattler/Cargo.lock
Author
|
Superseded by conda#2654, opened directly from the resolved maintainer branch for today’s release. |
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
7 participants
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.
Resolves the merge conflicts in conda#2615 by merging the latest upstream
mainintofeat/azure-blob-channel.Conflict resolutions preserve both the Azure changes and the latest OCI authentication-storage integration. Lockfiles were regenerated against current
main.Validation performed:
cargo fmt --all -- --checkcargo checkwith CI featurescargo check --manifest-path py-rattler/Cargo.tomlcargo clippy --all-targets --workspace -- -D warnings -Dclippy::dbg_macroOriginal request: “Can you rebase this PR conda#2615 and review it?”