Merge branch 'master' into cdriver-6045-renegotiation

Author: Julia-Garland

.evergreen/config_generator/components/abi_compliance_check.py

@@ -1,28 +1,26 @@
-from shrub.v3.evg_command import EvgCommandType
-from shrub.v3.evg_command import s3_put
+from shrub.v3.evg_command import EvgCommandType, s3_put
 from shrub.v3.evg_task import EvgTask
 
-from config_generator.components.funcs.set_cache_dir import SetCacheDir
-
+from config_generator.components.funcs.install_uv import InstallUV
 from config_generator.etc.function import Function
 from config_generator.etc.utils import bash_exec
 
 
 class CheckABICompliance(Function):
     name = 'abi-compliance-check'
-    commands = SetCacheDir.commands + [
+    commands = [
         bash_exec(
             command_type=EvgCommandType.SETUP,
             working_dir='mongoc',
             include_expansions_in_env=['MONGO_C_DRIVER_CACHE_DIR'],
-            script='.evergreen/scripts/abi-compliance-check-setup.sh'
+            script='.evergreen/scripts/abi-compliance-check-setup.sh',
         ),
         bash_exec(
             command_type=EvgCommandType.TEST,
             add_expansions_to_env=True,
             working_dir='mongoc',
-            include_expansions_in_env=['MONGO_C_DRIVER_CACHE_DIR'],
-            script='.evergreen/scripts/abi-compliance-check.sh'
+            include_expansions_in_env=['MONGO_C_DRIVER_CACHE_DIR', 'UV_INSTALL_DIR'],
+            script='.evergreen/scripts/abi-compliance-check.sh',
         ),
         s3_put(
             command_type=EvgCommandType.SYSTEM,
@@ -57,6 +55,9 @@ def tasks():
     return [
         EvgTask(
             name=CheckABICompliance.name,
-            commands=[CheckABICompliance.call()],
+            commands=[
+                InstallUV.call(),
+                CheckABICompliance.call(),
+            ],
         )
     ]

.evergreen/config_generator/components/c_std_compile.py

@@ -2,15 +2,11 @@
 from shrub.v3.evg_command import EvgCommandType
 from shrub.v3.evg_task import EvgTask, EvgTaskRef
 
-from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest
-
-from config_generator.etc.distros import find_large_distro
-from config_generator.etc.distros import make_distro_str
-from config_generator.etc.distros import compiler_to_vars
+from config_generator.components.funcs.install_uv import InstallUV
+from config_generator.etc.distros import compiler_to_vars, find_large_distro, make_distro_str
 from config_generator.etc.function import Function
 from config_generator.etc.utils import bash_exec
 
-
 TAG = 'std-matrix'
 
 
@@ -95,10 +91,7 @@ def tasks():
                     name=task_name,
                     run_on=distro.name,
                     tags=tags + [f'std-c{std}'],
-                    commands=[
-                        FindCMakeLatest.call(),
-                        StdCompile.call(vars=compile_vars | with_std)
-                    ],
+                    commands=[InstallUV.call(), StdCompile.call(vars=compile_vars | with_std)],
                 )
             )
 

.evergreen/config_generator/components/clang_format.py

@@ -1,26 +1,25 @@
 from shrub.v3.evg_build_variant import BuildVariant
 from shrub.v3.evg_command import EvgCommandType
-from shrub.v3.evg_task import EvgTask
-from shrub.v3.evg_task import EvgTaskRef
+from shrub.v3.evg_task import EvgTask, EvgTaskRef
 
+from config_generator.components.funcs.install_uv import InstallUV
 from config_generator.etc.distros import find_small_distro
 from config_generator.etc.function import Function
 from config_generator.etc.utils import bash_exec
 
-
-TAG = "clang-format"
+TAG = 'clang-format'
 
 
 class ClangFormat(Function):
     name = TAG
     commands = [
         bash_exec(
             command_type=EvgCommandType.TEST,
-            working_dir="mongoc",
+            working_dir='mongoc',
             env={
-                "DRYRUN": "1",
+                'DRYRUN': '1',
             },
-            script="uv run --frozen --only-group=format tools/format.py --mode=check",
+            script='PATH="${UV_INSTALL_DIR}:$PATH" uv run --frozen --only-group=format tools/format.py --mode=check',
         ),
     ]
 
@@ -33,7 +32,10 @@ def tasks():
     yield EvgTask(
         name=TAG,
         tags=[TAG],
-        commands=[ClangFormat.call()],
+        commands=[
+            InstallUV.call(),
+            ClangFormat.call(),
+        ],
     )
 
 
@@ -42,7 +44,7 @@ def variants():
         BuildVariant(
             name=TAG,
             display_name=TAG,
-            run_on=[find_small_distro("ubuntu2204").name],
-            tasks=[EvgTaskRef(name=f".{TAG}")],
+            run_on=[find_small_distro('ubuntu2204').name],
+            tasks=[EvgTaskRef(name=f'.{TAG}')],
         ),
     ]

.evergreen/config_generator/components/cse/darwinssl.py

@@ -2,11 +2,9 @@
 from shrub.v3.evg_task import EvgTaskRef
 
 from config_generator.etc.compile import generate_compile_tasks
-
 from config_generator.etc.cse.compile import CompileCommon
 from config_generator.etc.cse.test import generate_test_tasks
 
-
 SSL = 'darwinssl'
 TAG = f'cse-matrix-{SSL}'
 
@@ -52,9 +50,7 @@ def tasks():
 
     MORE_TAGS = ['cse']
 
-    res += generate_compile_tasks(
-        SSL, TAG, SASL_TO_FUNC, COMPILE_MATRIX, MORE_TAGS
-    )
+    res += generate_compile_tasks(SSL, TAG, SASL_TO_FUNC, COMPILE_MATRIX, MORE_TAGS)
 
     res += generate_test_tasks(SSL, TAG, TEST_MATRIX)
 

.evergreen/config_generator/components/cse/openssl.py

@@ -1,12 +1,10 @@
 from shrub.v3.evg_build_variant import BuildVariant
 
 from config_generator.etc.compile import generate_compile_tasks
-from config_generator.etc.function import merge_defns
-from config_generator.etc.utils import TaskRef
-
 from config_generator.etc.cse.compile import CompileCommon
 from config_generator.etc.cse.test import generate_test_tasks
-
+from config_generator.etc.function import merge_defns
+from config_generator.etc.utils import TaskRef
 
 SSL = 'openssl'
 TAG = f'cse-matrix-{SSL}'
@@ -83,7 +81,7 @@ def tasks():
 
     # PowerPC and zSeries are limited resources.
     for task in res:
-        if any(pattern in task.run_on for pattern in ["power", "zseries"]):
+        if any(pattern in task.run_on for pattern in ['power', 'zseries']):
             task.patchable = False
 
     return res
@@ -98,11 +96,11 @@ def variants():
 
     # PowerPC and zSeries are limited resources.
     for task in TASKS:
-        if any(pattern in task.run_on for pattern in ["power", "zseries"]):
+        if any(pattern in task.run_on for pattern in ['power', 'zseries']):
             tasks.append(
                 TaskRef(
                     name=task.name,
-                    batchtime=1440,   # 1 day
+                    batchtime=1440,  # 1 day
                 )
             )
         else:

.evergreen/config_generator/components/cse/winssl.py

@@ -2,11 +2,9 @@
 from shrub.v3.evg_task import EvgTaskRef
 
 from config_generator.etc.compile import generate_compile_tasks
-
 from config_generator.etc.cse.compile import CompileCommon
 from config_generator.etc.cse.test import generate_test_tasks
 
-
 SSL = 'winssl'
 TAG = f'cse-matrix-{SSL}'
 
@@ -50,9 +48,7 @@ def tasks():
 
     MORE_TAGS = ['cse']
 
-    res += generate_compile_tasks(
-        SSL, TAG, SASL_TO_FUNC, COMPILE_MATRIX, MORE_TAGS
-    )
+    res += generate_compile_tasks(SSL, TAG, SASL_TO_FUNC, COMPILE_MATRIX, MORE_TAGS)
 
     res += generate_test_tasks(SSL, TAG, TEST_MATRIX)