Merge 24.1.x back into main
#5188
Merged
Conversation
This file contains 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
* Add test for rpath patcher not called for symlinks * Use skip_symlinks=True for former is_codefile/codefile_type calls --------- Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
* Add test recipe outputs_overwrite_base_file * Fix corrupted package cache for outputs in subpackage tests This re-introduces `conda_build.environ.clean_pkg_cache` with slight changes to not use `conda.models.dist.Dist` and handle multiple `pkgs_dirs` better. --------- Signed-off-by: Marcel Bargull <marcel.bargull@udo.edu>
conda-bot
added
the
cla-signed
beeankha
previously approved these changes
Feb 15, 2024
|
we should merge #5189 into |
beeankha
approved these changes
Feb 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Xref #5134
Warning
DO NOT SQUASH MERGE!