more fixes

Author: abr-egn

.evergreen/build-nextest-archive.sh

@@ -12,6 +12,7 @@ add_conditional_features
 
 if [[ "$ARCHIVE_IN_USE_ENCRYPTION" = true ]]; then
     FEATURE_FLAGS+=("in-use-encryption" "azure-kms" "text-indexes-unstable" "aws-auth")
+    .evergreen/install-dependencies.sh libmongocrypt
 fi
 
 cargo nextest archive --workspace $(features_option) --archive-file nextest-archive.tar.zst

.evergreen/config.yml

@@ -1350,7 +1350,6 @@ tasks:
 
   - name: build-nextest-archive
     commands:
-    - func: "optional install libmongocrypt"
     - command: subprocess.exec
       type: setup
       params:
@@ -1364,9 +1363,9 @@ tasks:
           - ZSTD
           - ZLIB
           - SNAPPY
-          - ARCHIVE_IN_USE_ENCRYPTION
           - MONGOCRYPT_LIB_DIR
           - LD_LIBRARY_PATH
+          - ARCHIVE_IN_USE_ENCRYPTION
     - command: s3.put
       type: setup
       params:
@@ -1613,16 +1612,6 @@ functions:
         ${PREPARE_SHELL}
         .evergreen/install-dependencies.sh libmongocrypt
 
-  "optional install libmongocrypt":
-    command: shell.exec
-    params:
-      working_dir: src
-      script: |
-        ${PREPARE_SHELL}
-        if [[ "${ARCHIVE_IN_USE_ENCRYPTION}" == "true" ]]; then
-          .evergreen/install-dependencies.sh libmongocrypt
-        fi
-
   "install junit dependencies":
     command: shell.exec
     params:

.evergreen/install-dependencies.sh

@@ -32,8 +32,7 @@ for arg; do
 
     # This file is not created by default on Windows
     echo 'export PATH="$PATH:${CARGO_HOME}/bin"' >>${CARGO_HOME}/env
-    echo "export CARGO_NET_GIT_FETCH_WITH_CLI=true" >>${CARGO_HOME}/env
-
+    
     source .evergreen/env.sh
     rustup toolchain install nightly -c rustfmt
   elif [ $arg == "junit-dependencies" ]; then