Skip to content

Use EVG distro system uv binaries #1464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eramongodb merged 1 commit into from
Sep 19, 2025
Merged

Use EVG distro system uv binaries #1464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions .evergreen/config_generator/components/abi_stability.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from shrub.v3.evg_task_group import EvgTaskGroup

from config_generator.components.funcs.install_c_driver import InstallCDriver
from config_generator.components.funcs.install_uv import InstallUV
from config_generator.etc.distros import find_large_distro
from config_generator.etc.function import Function, merge_defns
from config_generator.etc.utils import bash_exec
Expand Down Expand Up @@ -183,18 +182,14 @@ def task_groups():
setup_task_can_fail_task=True,
setup_task=[
git_get_project(directory='mongo-cxx-driver'),
InstallUV.call(),
InstallCDriver.call(),
bash_exec(
command_type=EvgCommandType.SETUP,
env={
'cxx_standard': f'{cxx_standard}',
'polyfill': polyfill,
},
include_expansions_in_env=[
'distro_id',
'UV_INSTALL_DIR',
],
include_expansions_in_env=['distro_id'],
script='mongo-cxx-driver/.evergreen/scripts/abi-stability-setup.sh',
),
s3_put(
Expand Down
2 changes: 0 additions & 2 deletions .evergreen/config_generator/components/atlas_search_indexes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from config_generator.components.funcs.compile import Compile
from config_generator.components.funcs.fetch_det import FetchDET
from config_generator.components.funcs.install_c_driver import InstallCDriver
from config_generator.components.funcs.install_uv import InstallUV
from config_generator.components.funcs.setup import Setup
from config_generator.etc.distros import find_large_distro
from config_generator.etc.function import Function
Expand Down Expand Up @@ -53,7 +52,6 @@ def tasks():
tags=[TAG, distro_name],
run_on=distro.name,
commands=[
InstallUV.call(),
InstallCDriver.call(),
Compile.call(build_type='Debug', vars={'ENABLE_TESTS': 'ON'}),
TestSearchIndexHelpers.call(),
Expand Down
3 changes: 0 additions & 3 deletions .evergreen/config_generator/components/clang_tidy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from shrub.v3.evg_task import EvgTask, EvgTaskRef

from config_generator.components.funcs.install_c_driver import InstallCDriver
from config_generator.components.funcs.install_uv import InstallUV
from config_generator.components.funcs.setup import Setup
from config_generator.etc.distros import compiler_to_vars, find_small_distro
from config_generator.etc.function import Function
Expand All @@ -23,7 +22,6 @@ class ClangTidy(Function):
'cc_compiler',
'cxx_compiler',
'distro_id',
'UV_INSTALL_DIR',
],
script='etc/run-clang-tidy.sh',
)
Expand Down Expand Up @@ -52,7 +50,6 @@ def tasks():
run_on=distro.name,
commands=[
Setup.call(),
InstallUV.call(),
InstallCDriver.call(compiler='clang'),
ClangTidy.call(compiler='clang'),
],
Expand Down
4 changes: 0 additions & 4 deletions .evergreen/config_generator/components/cmake_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

from config_generator.components.funcs.fetch_c_driver_source import FetchCDriverSource
from config_generator.components.funcs.install_c_driver import InstallCDriver
from config_generator.components.funcs.install_uv import InstallUV
from config_generator.components.funcs.setup import Setup
from config_generator.etc.distros import find_small_distro
from config_generator.etc.function import Function
Expand Down Expand Up @@ -33,7 +32,6 @@ class CMakeCompat(Function):
'CMAKE_VERSION',
'distro_id',
'INSTALL_C_DRIVER',
'UV_INSTALL_DIR',
],
script='.evergreen/scripts/cmake-compat.sh',
),
Expand All @@ -43,7 +41,6 @@ class CMakeCompat(Function):
'CMAKE_VERSION',
'distro_id',
'INSTALL_C_DRIVER',
'UV_INSTALL_DIR',
],
script='mongo-cxx-driver/.evergreen/scripts/cmake-compat-check.sh',
),
Expand All @@ -65,7 +62,6 @@ def tasks():
for install_c_driver in install_c_driver_modes:
commands = [
Setup.call(),
InstallUV.call(),
(InstallCDriver.call() if install_c_driver else FetchCDriverSource.call()),
CMakeCompat.call(
vars={
Expand Down
18 changes: 9 additions & 9 deletions .evergreen/config_generator/components/compile_only.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

from config_generator.components.funcs.compile import Compile
from config_generator.components.funcs.install_c_driver import InstallCDriver
from config_generator.components.funcs.install_uv import InstallUV
from config_generator.components.funcs.setup import Setup
from config_generator.etc.distros import compiler_to_vars, find_large_distro, make_distro_str

Expand All @@ -17,8 +16,7 @@
# C++ standard and compiler coverage

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

('rhel7.9', 'gcc', [11, 14, ]), # GCC 4.8 (max: C++14)
('rhel80', 'gcc', [11, 17, 20, ]), # GCC 8.2 (max: C++20)
('rhel84', 'gcc', [11, 17, 20, ]), # GCC 8.4 (max: C++20)
('ubuntu2004', 'gcc-9', [11, 17, 20, ]), # GCC 9.4 (max: C++20)
('debian11', 'gcc-10', [11, 17, 20, ]), # GCC 10.2 (max: C++20)
# ('rhel84', 'gcc', [11, 17, 20, ]), # GCC 8.4 (max: C++20) # No uv binary available.
# ('debian11', 'gcc-10', [11, 17, 20, ]), # GCC 10.2 (max: C++20) # No uv binary available.
('rhel90', 'gcc', [11, 17, 20, 23]), # GCC 11.2 (max: C++23)
('rhel92', 'gcc', [11, 17, 20, 23]), # GCC 11.3 (max: C++23)
('rhel94', 'gcc', [11, 17, 20, 23]), # GCC 11.4 (max: C++23)
('rhel95', 'gcc', [11, 17, 20, 23]), # GCC 11.5 (max: C++23)
('debian12', 'gcc', [11, 17, 20, ]), # GCC 12.2 (max: C++23)
('ubuntu2404', 'gcc-13', [11, 17, 20, ]), # GCC 13.3 (max: C++23)

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

# Other coverage.

('ubuntu2004-arm64', 'gcc', [11, 17]), # Clang 10
('ubuntu2004-arm64', 'clang', [11, 17]), # Clang 10
('ubuntu2204-arm64', 'gcc', [11, 17]), # GCC 11.4
('ubuntu2404-arm64', 'gcc', [11, 17]), # GCC 13.3
('ubuntu2204-arm64', 'clang', [11, 17]), # Clang 14
('ubuntu2404-arm64', 'clang', [11, 17]), # Clang 18

('rhel8-power', None, [11, 17]),
('rhel8-zseries', None, [11, 17]),
Expand Down Expand Up @@ -92,7 +93,6 @@ def tasks():
commands = [expansions_update(updates=updates)] if updates else []
commands += [
Setup.call(),
InstallUV.call(),
InstallCDriver.call(),
Compile.call(
build_type=build_type,
Expand Down
1 change: 0 additions & 1 deletion .evergreen/config_generator/components/funcs/compile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ class Compile(Function):
'USE_SANITIZER_ASAN',
'USE_SANITIZER_UBSAN',
'USE_STATIC_LIBS',
'UV_INSTALL_DIR',
],
working_dir='mongo-cxx-driver',
script='.evergreen/scripts/compile.sh',
Expand Down
58 changes: 0 additions & 58 deletions .evergreen/config_generator/components/funcs/install_uv.py
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion .evergreen/config_generator/components/funcs/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ class Test(Function):
'TEST_WITH_VALGRIND',
'use_mongocryptd',
'USE_STATIC_LIBS',
'UV_INSTALL_DIR',
'VALGRIND_INSTALL_DIR',
],
env={
Expand Down
22 changes: 10 additions & 12 deletions .evergreen/config_generator/components/integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
from config_generator.components.funcs.compile import Compile
from config_generator.components.funcs.fetch_det import FetchDET
from config_generator.components.funcs.install_c_driver import InstallCDriver
from config_generator.components.funcs.install_uv import InstallUV
from config_generator.components.funcs.run_kms_servers import RunKMSServers
from config_generator.components.funcs.setup import Setup
from config_generator.components.funcs.start_mongod import StartMongod
Expand All @@ -25,8 +24,8 @@
('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']),

# Linux ARM64 (full).
# Linux ARM64: 4.4+.
('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']),
# RHEL 8 ARM64: 4.4+.
('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']),

# Linux Power.
# RHEL 8 Power: 4.2+.
Expand Down Expand Up @@ -55,13 +54,13 @@
]

MONGOCRYPTD_MATRIX = [
('rhel80', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
('ubuntu2004-arm64', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
('rhel8-power', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
('rhel8-zseries', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
('macos-14-arm64', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
('macos-14', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
('windows-vsCurrent', 'vs2022x64', ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
('rhel80', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
('rhel8-arm64-latest', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
('rhel8-power', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
('rhel8-zseries', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
('macos-14-arm64', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
('macos-14', None, ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
('windows-vsCurrent', 'vs2022x64', ['Debug'], ['shared'], [11], [None], ['crypt'], ['latest'], ['replica']),
]

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

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

if link_type == 'static':
Expand All @@ -148,7 +147,6 @@ def tasks():
commands += [
Setup.call(),
StartMongod.call(mongodb_version=mongodb_version, topology=topology),
InstallUV.call(),
InstallCDriver.call(vars=icd_vars),
Compile.call(polyfill=polyfill, vars=compile_vars),
FetchDET.call(),
Expand Down
4 changes: 1 addition & 3 deletions .evergreen/config_generator/components/lint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from shrub.v3.evg_command import EvgCommandType
from shrub.v3.evg_task import EvgTask, EvgTaskRef

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


Expand All @@ -36,7 +35,6 @@ def tasks():
run_on=distro.name,
commands=[
Setup.call(),
InstallUV.call(),
Lint.call(),
],
),
Expand Down
2 changes: 0 additions & 2 deletions .evergreen/config_generator/components/macro_guards.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

from config_generator.components.funcs.compile import Compile
from config_generator.components.funcs.fetch_c_driver_source import FetchCDriverSource
from config_generator.components.funcs.install_uv import InstallUV
from config_generator.components.funcs.setup import Setup
from config_generator.etc.distros import find_large_distro, make_distro_str

Expand Down Expand Up @@ -41,7 +40,6 @@ def tasks():
commands=[
Setup.call(),
FetchCDriverSource.call(),
InstallUV.call(),
Compile.call(
build_type='Debug',
compiler=compiler,
Expand Down
2 changes: 0 additions & 2 deletions .evergreen/config_generator/components/mongohouse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

from config_generator.components.funcs.compile import Compile
from config_generator.components.funcs.fetch_c_driver_source import FetchCDriverSource
from config_generator.components.funcs.install_uv import InstallUV
from config_generator.components.funcs.setup import Setup
from config_generator.etc.distros import find_large_distro
from config_generator.etc.function import Function, merge_defns
Expand Down Expand Up @@ -76,7 +75,6 @@ def tasks():
commands=[
Setup.call(),
FetchCDriverSource.call(),
InstallUV.call(),
Compile.call(build_type='Release', vars={'ENABLE_TESTS': 'ON'}),
BuildMongohouse.call(),
RunMongohouse.call(),
Expand Down
2 changes: 0 additions & 2 deletions .evergreen/config_generator/components/sanitizers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
from config_generator.components.funcs.compile import Compile
from config_generator.components.funcs.fetch_det import FetchDET
from config_generator.components.funcs.install_c_driver import InstallCDriver
from config_generator.components.funcs.install_uv import InstallUV
from config_generator.components.funcs.run_kms_servers import RunKMSServers
from config_generator.components.funcs.setup import Setup
from config_generator.components.funcs.start_mongod import StartMongod
Expand Down Expand Up @@ -98,7 +97,6 @@ def tasks():
commands += [
Setup.call(),
StartMongod.call(mongodb_version=mongodb_version, topology=topology),
InstallUV.call(),
InstallCDriver.call(),
Compile.call(vars=compile_vars),
FetchDET.call(),
Expand Down
2 changes: 0 additions & 2 deletions .evergreen/config_generator/components/scan_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from shrub.v3.evg_task import EvgTask, EvgTaskRef

from config_generator.components.funcs.fetch_c_driver_source import FetchCDriverSource
from config_generator.components.funcs.install_uv import InstallUV
from config_generator.components.funcs.setup import Setup
from config_generator.etc.distros import find_large_distro
from config_generator.etc.function import Function, merge_defns
Expand Down Expand Up @@ -120,7 +119,6 @@ def tasks():
commands=[
Setup.call(),
FetchCDriverSource.call(),
InstallUV.call(),
RunScanBuild.call(cxx_standard, polyfill),
UploadScanArtifacts.call(),
],
Expand Down
Loading