Skip to content

Commit 4e9e041

Browse files
eramongodberamongodb
authored
Use EVG distro system uv binaries (#1464)
1 parent b224074 commit 4e9e041

32 files changed

+1927
-4958
lines changed

‎.evergreen/config_generator/components/abi_stability.py‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from shrub.v3.evg_task_group import EvgTaskGroup
77

88
from config_generator.components.funcs.install_c_driver import InstallCDriver
9-
from config_generator.components.funcs.install_uv import InstallUV
109
from config_generator.etc.distros import find_large_distro
1110
from config_generator.etc.function import Function, merge_defns
1211
from config_generator.etc.utils import bash_exec
@@ -183,18 +182,14 @@ def task_groups():
183182
setup_task_can_fail_task=True,
184183
setup_task=[
185184
git_get_project(directory='mongo-cxx-driver'),
186-
InstallUV.call(),
187185
InstallCDriver.call(),
188186
bash_exec(
189187
command_type=EvgCommandType.SETUP,
190188
env={
191189
'cxx_standard': f'{cxx_standard}',
192190
'polyfill': polyfill,
193191
},
194-
include_expansions_in_env=[
195-
'distro_id',
196-
'UV_INSTALL_DIR',
197-
],
192+
include_expansions_in_env=['distro_id'],
198193
script='mongo-cxx-driver/.evergreen/scripts/abi-stability-setup.sh',
199194
),
200195
s3_put(

‎.evergreen/config_generator/components/atlas_search_indexes.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from config_generator.components.funcs.compile import Compile
77
from config_generator.components.funcs.fetch_det import FetchDET
88
from config_generator.components.funcs.install_c_driver import InstallCDriver
9-
from config_generator.components.funcs.install_uv import InstallUV
109
from config_generator.components.funcs.setup import Setup
1110
from config_generator.etc.distros import find_large_distro
1211
from config_generator.etc.function import Function
@@ -53,7 +52,6 @@ def tasks():
5352
tags=[TAG, distro_name],
5453
run_on=distro.name,
5554
commands=[
56-
InstallUV.call(),
5755
InstallCDriver.call(),
5856
Compile.call(build_type='Debug', vars={'ENABLE_TESTS': 'ON'}),
5957
TestSearchIndexHelpers.call(),

‎.evergreen/config_generator/components/clang_tidy.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
from shrub.v3.evg_task import EvgTask, EvgTaskRef
66

77
from config_generator.components.funcs.install_c_driver import InstallCDriver
8-
from config_generator.components.funcs.install_uv import InstallUV
98
from config_generator.components.funcs.setup import Setup
109
from config_generator.etc.distros import compiler_to_vars, find_small_distro
1110
from config_generator.etc.function import Function
@@ -23,7 +22,6 @@ class ClangTidy(Function):
2322
'cc_compiler',
2423
'cxx_compiler',
2524
'distro_id',
26-
'UV_INSTALL_DIR',
2725
],
2826
script='etc/run-clang-tidy.sh',
2927
)
@@ -52,7 +50,6 @@ def tasks():
5250
run_on=distro.name,
5351
commands=[
5452
Setup.call(),
55-
InstallUV.call(),
5653
InstallCDriver.call(compiler='clang'),
5754
ClangTidy.call(compiler='clang'),
5855
],

‎.evergreen/config_generator/components/cmake_compat.py‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
from config_generator.components.funcs.fetch_c_driver_source import FetchCDriverSource
66
from config_generator.components.funcs.install_c_driver import InstallCDriver
7-
from config_generator.components.funcs.install_uv import InstallUV
87
from config_generator.components.funcs.setup import Setup
98
from config_generator.etc.distros import find_small_distro
109
from config_generator.etc.function import Function
@@ -33,7 +32,6 @@ class CMakeCompat(Function):
3332
'CMAKE_VERSION',
3433
'distro_id',
3534
'INSTALL_C_DRIVER',
36-
'UV_INSTALL_DIR',
3735
],
3836
script='.evergreen/scripts/cmake-compat.sh',
3937
),
@@ -43,7 +41,6 @@ class CMakeCompat(Function):
4341
'CMAKE_VERSION',
4442
'distro_id',
4543
'INSTALL_C_DRIVER',
46-
'UV_INSTALL_DIR',
4744
],
4845
script='mongo-cxx-driver/.evergreen/scripts/cmake-compat-check.sh',
4946
),
@@ -65,7 +62,6 @@ def tasks():
6562
for install_c_driver in install_c_driver_modes:
6663
commands = [
6764
Setup.call(),
68-
InstallUV.call(),
6965
(InstallCDriver.call() if install_c_driver else FetchCDriverSource.call()),
7066
CMakeCompat.call(
7167
vars={

‎.evergreen/config_generator/components/compile_only.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
from config_generator.components.funcs.compile import Compile
66
from config_generator.components.funcs.install_c_driver import InstallCDriver
7-
from config_generator.components.funcs.install_uv import InstallUV
87
from config_generator.components.funcs.setup import Setup
98
from config_generator.etc.distros import compiler_to_vars, find_large_distro, make_distro_str
109

@@ -17,8 +16,7 @@
1716
# C++ standard and compiler coverage
1817

1918
('rhel80', 'clang', [11, 17, 20, ]), # Clang 7 (max: C++20)
20-
('ubuntu2004', 'clang-10', [11, 17, 20, ]), # Clang 10 (max: C++20)
21-
('rhel84', 'clang', [11, 17, 20, ]), # Clang 11 (max: C++20)
19+
# ('rhel84', 'clang', [11, 17, 20, ]), # Clang 11 (max: C++20) # No uv binary available.
2220
('ubuntu2204', 'clang-12', [11, 17, 20, 23]), # Clang 12 (max: C++23)
2321
('rhel90', 'clang', [11, 17, 20, 23]), # Clang 13 (max: C++23)
2422
('rhel91', 'clang', [11, 17, 20, 23]), # Clang 14 (max: C++23)
@@ -29,13 +27,14 @@
2927

3028
('rhel7.9', 'gcc', [11, 14, ]), # GCC 4.8 (max: C++14)
3129
('rhel80', 'gcc', [11, 17, 20, ]), # GCC 8.2 (max: C++20)
32-
('rhel84', 'gcc', [11, 17, 20, ]), # GCC 8.4 (max: C++20)
33-
('ubuntu2004', 'gcc-9', [11, 17, 20, ]), # GCC 9.4 (max: C++20)
34-
('debian11', 'gcc-10', [11, 17, 20, ]), # GCC 10.2 (max: C++20)
30+
# ('rhel84', 'gcc', [11, 17, 20, ]), # GCC 8.4 (max: C++20) # No uv binary available.
31+
# ('debian11', 'gcc-10', [11, 17, 20, ]), # GCC 10.2 (max: C++20) # No uv binary available.
3532
('rhel90', 'gcc', [11, 17, 20, 23]), # GCC 11.2 (max: C++23)
3633
('rhel92', 'gcc', [11, 17, 20, 23]), # GCC 11.3 (max: C++23)
3734
('rhel94', 'gcc', [11, 17, 20, 23]), # GCC 11.4 (max: C++23)
3835
('rhel95', 'gcc', [11, 17, 20, 23]), # GCC 11.5 (max: C++23)
36+
('debian12', 'gcc', [11, 17, 20, ]), # GCC 12.2 (max: C++23)
37+
('ubuntu2404', 'gcc-13', [11, 17, 20, ]), # GCC 13.3 (max: C++23)
3938

4039
('windows-vsCurrent', 'vs2015x64', [11, 14, 'latest']), # Max: C++14
4140
('windows-vsCurrent', 'vs2017x64', [11, 14, 17, 20, 'latest']), # Max: C++20
@@ -44,8 +43,10 @@
4443

4544
# Other coverage.
4645

47-
('ubuntu2004-arm64', 'gcc', [11, 17]), # Clang 10
48-
('ubuntu2004-arm64', 'clang', [11, 17]), # Clang 10
46+
('ubuntu2204-arm64', 'gcc', [11, 17]), # GCC 11.4
47+
('ubuntu2404-arm64', 'gcc', [11, 17]), # GCC 13.3
48+
('ubuntu2204-arm64', 'clang', [11, 17]), # Clang 14
49+
('ubuntu2404-arm64', 'clang', [11, 17]), # Clang 18
4950

5051
('rhel8-power', None, [11, 17]),
5152
('rhel8-zseries', None, [11, 17]),
@@ -92,7 +93,6 @@ def tasks():
9293
commands = [expansions_update(updates=updates)] if updates else []
9394
commands += [
9495
Setup.call(),
95-
InstallUV.call(),
9696
InstallCDriver.call(),
9797
Compile.call(
9898
build_type=build_type,

‎.evergreen/config_generator/components/funcs/compile.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ class Compile(Function):
3030
'USE_SANITIZER_ASAN',
3131
'USE_SANITIZER_UBSAN',
3232
'USE_STATIC_LIBS',
33-
'UV_INSTALL_DIR',
3433
],
3534
working_dir='mongo-cxx-driver',
3635
script='.evergreen/scripts/compile.sh',

‎.evergreen/config_generator/components/funcs/install_uv.py‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎.evergreen/config_generator/components/funcs/test.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ class Test(Function):
3939
'TEST_WITH_VALGRIND',
4040
'use_mongocryptd',
4141
'USE_STATIC_LIBS',
42-
'UV_INSTALL_DIR',
4342
'VALGRIND_INSTALL_DIR',
4443
],
4544
env={

‎.evergreen/config_generator/components/integration.py‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from config_generator.components.funcs.compile import Compile
88
from config_generator.components.funcs.fetch_det import FetchDET
99
from config_generator.components.funcs.install_c_driver import InstallCDriver
10-
from config_generator.components.funcs.install_uv import InstallUV
1110
from config_generator.components.funcs.run_kms_servers import RunKMSServers
1211
from config_generator.components.funcs.setup import Setup
1312
from config_generator.components.funcs.start_mongod import StartMongod
@@ -25,8 +24,8 @@
2524
('rhel80', None, ['Debug'], ['shared', 'static'], [11, 17], [None], ['plain', 'csfle'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest'], ['single', 'replica', 'sharded']),
2625

2726
# Linux ARM64 (full).
28-
# Linux ARM64: 4.4+.
29-
('ubuntu2004-arm64', None, ['Debug'], ['shared', 'static'], [11, 17], [None], ['plain', 'csfle'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest'], ['single', 'replica', 'sharded']),
27+
# RHEL 8 ARM64: 4.4+.
28+
('rhel8-arm64-latest', None, ['Debug'], ['shared', 'static'], [11, 17], [None], ['plain', 'csfle'], ['4.4', '5.0', '6.0', '7.0', '8.0', 'latest'], ['single', 'replica', 'sharded']),
3029

3130
# Linux Power.
3231
# RHEL 8 Power: 4.2+.
@@ -55,13 +54,13 @@
5554
]
5655

5756
MONGOCRYPTD_MATRIX = [
58-
('rhel80', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
59-
('ubuntu2004-arm64', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
60-
('rhel8-power', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
61-
('rhel8-zseries', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
62-
('macos-14-arm64', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
63-
('macos-14', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
64-
('windows-vsCurrent', 'vs2022x64', ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
57+
('rhel80', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
58+
('rhel8-arm64-latest', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
59+
('rhel8-power', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
60+
('rhel8-zseries', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
61+
('macos-14-arm64', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
62+
('macos-14', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
63+
('windows-vsCurrent', 'vs2022x64', ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
6564
]
6665

6766
# fmt: on
@@ -130,7 +129,7 @@ def tasks():
130129
if distro.os_type == 'windows':
131130
test_vars |= {'example_projects_cxx_standard': 17}
132131

133-
if build_type == 'Debug' and distro.os in ['ubuntu1804', 'ubuntu2004', 'ubuntu2204']:
132+
if build_type == 'Debug' and distro.os in ['ubuntu2204', 'ubuntu2404']:
134133
updates += [KeyValueParam(key='ENABLE_CODE_COVERAGE', value='ON')]
135134

136135
if link_type == 'static':
@@ -148,7 +147,6 @@ def tasks():
148147
commands += [
149148
Setup.call(),
150149
StartMongod.call(mongodb_version=mongodb_version, topology=topology),
151-
InstallUV.call(),
152150
InstallCDriver.call(vars=icd_vars),
153151
Compile.call(polyfill=polyfill, vars=compile_vars),
154152
FetchDET.call(),

‎.evergreen/config_generator/components/lint.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from shrub.v3.evg_command import EvgCommandType
33
from shrub.v3.evg_task import EvgTask, EvgTaskRef
44

5-
from config_generator.components.funcs.install_uv import InstallUV
65
from config_generator.components.funcs.setup import Setup
76
from config_generator.etc.distros import find_small_distro
87
from config_generator.etc.function import Function
@@ -17,7 +16,7 @@ class Lint(Function):
1716
command_type=EvgCommandType.TEST,
1817
working_dir='mongo-cxx-driver',
1918
env={'DRYRUN': '1'},
20-
script='PATH="${UV_INSTALL_DIR}:$PATH" uv run --frozen etc/format.py --mode check',
19+
script='uv run --frozen etc/format.py --mode check',
2120
)
2221

2322

@@ -36,7 +35,6 @@ def tasks():
3635
run_on=distro.name,
3736
commands=[
3837
Setup.call(),
39-
InstallUV.call(),
4038
Lint.call(),
4139
],
4240
),

0 commit comments

Comments
 (0)