Merge branch 'main' into python-3.13

rapidsai · Dec 17, 2024 · ed6a729 · ed6a729
2 parents 8b961f4 + 5781086
commit ed6a729
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile
@@ -21,7 +21,7 @@ usermod -g conda root
 EOF
 
 # Ownership & permissions based on https://docs.anaconda.com/anaconda/install/multi-user/#multi-user-anaconda-installation-on-linux
-COPY --from=condaforge/miniforge3:24.9.0-0 --chown=root:conda --chmod=770 /opt/conda /opt/conda
+COPY --from=condaforge/miniforge3:24.9.2-0 --chown=root:conda --chmod=770 /opt/conda /opt/conda
 
 # Ensure new files are created with group write access & setgid. See https://unix.stackexchange.com/a/12845
 RUN chmod g+ws /opt/conda

diff --git a/context/condarc.tmpl b/context/condarc.tmpl
@@ -13,3 +13,4 @@ conda-build:
   output_folder: $RAPIDS_CONDA_BLD_OUTPUT_DIR
 number_channel_notices: 0
 always_yes: true
+quiet: true