Merge branch 'main' into pyupgrade-config

rapidsai · Sep 11, 2024 · bfcc9ea · bfcc9ea
2 parents 25cd5f1 + 19639f4
commit bfcc9ea
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 9 deletions.
diff --git a/ci/publish/conda.sh b/ci/publish/conda.sh
@@ -9,7 +9,7 @@ set -euo pipefail
   . /usr/share/miniconda/etc/profile.d/conda.sh
   conda activate base
   conda install -y anaconda-client
-  pkgs_to_upload=$(find "${CONDA_OUTPUT_DIR}" -name "*.tar.bz2")
+  pkgs_to_upload=$(find "${CONDA_OUTPUT_DIR}" -name "*.conda" -o -name "*.tar.bz2")
 
   export CONDA_ORG="${1}"
 

diff --git a/package-lock.json b/package-lock.json