Replace conda --force flag with --yes and update miniconda version (#32)

* Replace --force flag with --yes * Bump xcode version to 13.4.1 * Update image and conda versions * Use cmg
Nextdoor · Dec 19, 2024 · 110df77 · 110df77
1 parent 11f18c2
commit 110df77
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,21 +9,21 @@ commands:
 jobs:
   unit_test_linux:
     docker:
-      - image: circleci/python:3.7
+      - image: cimg/python:3.12
     steps:
       - checkout
       - run_install_and_script 
 
   unit_test_darwin:
     macos:
-      xcode: 12.5.1
+      xcode: 16.2.0
     steps:
       - checkout
       - run_install_and_script
 
   deploy_linux:
     docker:
-      - image: circleci/python:3.7
+      - image: cimg/python:3.12
     steps:
       - checkout
       # needs ANACONDA_ORG_TOKEN env var
@@ -32,7 +32,7 @@ jobs:
 
   deploy_darwin:
     macos:
-      xcode: 12.5.1
+      xcode: 16.2.0
     steps:
       - checkout
       # needs ANACONDA_ORG_TOKEN env var

diff --git a/ci/install.sh b/ci/install.sh
@@ -3,10 +3,10 @@
 set -e
 
 if [[ "$(uname)" == "Darwin" ]]; then
-    URL="https://repo.anaconda.com/miniconda/Miniconda3-py37_4.10.3-MacOSX-x86_64.sh"
+    URL="https://repo.anaconda.com/miniconda/Miniconda3-py39_24.11.1-0-MacOSX-arm64.sh"
     HOMEBREW_NO_AUTO_UPDATE=1 brew install wget
 else
-    URL="https://repo.anaconda.com/miniconda/Miniconda3-py37_4.10.3-Linux-x86_64.sh"
+    URL="https://repo.anaconda.com/miniconda/Miniconda3-py39_24.11.1-0-Linux-x86_64.sh"
 fi
 wget $URL -O miniconda.sh;
 bash miniconda.sh -b -p $HOME/miniconda

diff --git a/src/main.rs b/src/main.rs
@@ -255,7 +255,7 @@ fn freeze_same_platform(depfile_path: &str, lockfile_path: &str) -> Result<()> {
             &depfile_path,
             "-n",
             &tmp_name,
-            "--force",
+            "--yes",
         ],
     )?;
     info!("Made new env new env");
@@ -488,7 +488,7 @@ fn handle_create(matches: &ArgMatches) -> Result<()> {
         &[
             "env",
             "create",
-            "--force",
+            "--yes",
             "-q",
             "--json",
             "--name",