Skip to content

Commit f0f72d5

Browse files
eramongodberamongodb
authored
Re-enable distros previously missing system uv binaries (#1472)
1 parent 3500cbb commit f0f72d5

File tree

3 files changed

+192
-22
lines changed

3 files changed

+192
-22
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# C++ standard and compiler coverage
1717

1818
('rhel80', 'clang', [11, 17, 20, ]), # Clang 7 (max: C++20)
19-
# ('rhel84', 'clang', [11, 17, 20, ]), # Clang 11 (max: C++20) # No uv binary available.
19+
('rhel84', 'clang', [11, 17, 20, ]), # Clang 11 (max: C++20)
2020
('ubuntu2204', 'clang-12', [11, 17, 20, 23]), # Clang 12 (max: C++23)
2121
('rhel90', 'clang', [11, 17, 20, 23]), # Clang 13 (max: C++23)
2222
('rhel91', 'clang', [11, 17, 20, 23]), # Clang 14 (max: C++23)
@@ -25,16 +25,16 @@
2525
('rhel94', 'clang', [11, 17, 20, 23]), # Clang 17 (max: C++23)
2626
('rhel95', 'clang', [11, 17, 20, 23]), # Clang 19 (max: C++23)
2727

28-
('rhel7.9', 'gcc', [11, 14, ]), # GCC 4.8 (max: C++14)
29-
('rhel80', 'gcc', [11, 17, 20, ]), # GCC 8.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.
32-
('rhel90', 'gcc', [11, 17, 20, 23]), # GCC 11.2 (max: C++23)
33-
('rhel92', 'gcc', [11, 17, 20, 23]), # GCC 11.3 (max: C++23)
34-
('rhel94', 'gcc', [11, 17, 20, 23]), # GCC 11.4 (max: C++23)
35-
('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)
28+
('rhel7.9', 'gcc', [11, 14, ]), # GCC 4.8 (max: C++14)
29+
('rhel80', 'gcc', [11, 17, 20, ]), # GCC 8.2 (max: C++20)
30+
('rhel84', 'gcc', [11, 17, 20, ]), # GCC 8.4 (max: C++20)
31+
('debian11-latest', 'gcc-10', [11, 17, 20, ]), # GCC 10.2 (max: C++20)
32+
('rhel90', 'gcc', [11, 17, 20, 23]), # GCC 11.2 (max: C++23)
33+
('rhel92', 'gcc', [11, 17, 20, 23]), # GCC 11.3 (max: C++23)
34+
('rhel94', 'gcc', [11, 17, 20, 23]), # GCC 11.4 (max: C++23)
35+
('rhel95', 'gcc', [11, 17, 20, 23]), # GCC 11.5 (max: C++23)
36+
('debian12-latest', 'gcc', [11, 17, 20, ]), # GCC 12.2 (max: C++23)
37+
('ubuntu2404', 'gcc-13', [11, 17, 20, ]), # GCC 13.3 (max: C++23)
3838

3939
('windows-vsCurrent', 'vs2015x64', [11, 14, 'latest']), # Max: C++14
4040
('windows-vsCurrent', 'vs2017x64', [11, 14, 17, 20, 'latest']), # Max: C++20

‎.evergreen/config_generator/etc/distros.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ def ls_distro(name, **kwargs):
5050

5151

5252
DEBIAN_DISTROS = [
53-
*ls_distro(name='debian11', os='debian', os_type='linux', os_ver='11'),
54-
*ls_distro(name='debian12', os='debian', os_type='linux', os_ver='12'),
53+
*ls_distro(name='debian11-latest', os='debian', os_type='linux', os_ver='11'),
5554
*ls_distro(name='debian12-latest', os='debian', os_type='linux', os_ver='latest'),
5655
]
5756

‎.evergreen/generated_configs/tasks.yml‎

Lines changed: 180 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,66 @@ tasks:
223223
vars:
224224
CMAKE_VERSION: 3.15.0
225225
INSTALL_C_DRIVER: 1
226-
- name: compile-only-debian12-gcc-cxx11-debug
227-
run_on: debian12-large
228-
tags: [compile-only, debian12, cxx11, gcc, debug]
226+
- name: compile-only-debian11-latest-gcc-10-cxx11-debug
227+
run_on: debian11-latest-large
228+
tags: [compile-only, debian11-latest, cxx11, gcc-10, debug]
229+
commands:
230+
- command: expansions.update
231+
params:
232+
updates:
233+
- { key: build_type, value: Debug }
234+
- { key: cc_compiler, value: gcc-10 }
235+
- { key: cxx_compiler, value: g++-10 }
236+
- func: setup
237+
- func: install_c_driver
238+
- func: compile
239+
vars:
240+
BUILD_SHARED_AND_STATIC_LIBS: "ON"
241+
REQUIRED_CXX_STANDARD: 11
242+
build_type: Debug
243+
cc_compiler: gcc-10
244+
cxx_compiler: g++-10
245+
- name: compile-only-debian11-latest-gcc-10-cxx17-debug
246+
run_on: debian11-latest-large
247+
tags: [compile-only, debian11-latest, cxx17, gcc-10, debug]
248+
commands:
249+
- command: expansions.update
250+
params:
251+
updates:
252+
- { key: build_type, value: Debug }
253+
- { key: cc_compiler, value: gcc-10 }
254+
- { key: cxx_compiler, value: g++-10 }
255+
- func: setup
256+
- func: install_c_driver
257+
- func: compile
258+
vars:
259+
BUILD_SHARED_AND_STATIC_LIBS: "ON"
260+
REQUIRED_CXX_STANDARD: 17
261+
build_type: Debug
262+
cc_compiler: gcc-10
263+
cxx_compiler: g++-10
264+
- name: compile-only-debian11-latest-gcc-10-cxx20-debug
265+
run_on: debian11-latest-large
266+
tags: [compile-only, debian11-latest, cxx20, gcc-10, debug]
267+
commands:
268+
- command: expansions.update
269+
params:
270+
updates:
271+
- { key: build_type, value: Debug }
272+
- { key: cc_compiler, value: gcc-10 }
273+
- { key: cxx_compiler, value: g++-10 }
274+
- func: setup
275+
- func: install_c_driver
276+
- func: compile
277+
vars:
278+
BUILD_SHARED_AND_STATIC_LIBS: "ON"
279+
REQUIRED_CXX_STANDARD: 20
280+
build_type: Debug
281+
cc_compiler: gcc-10
282+
cxx_compiler: g++-10
283+
- name: compile-only-debian12-latest-gcc-cxx11-debug
284+
run_on: debian12-latest-large
285+
tags: [compile-only, debian12-latest, cxx11, gcc, debug]
229286
commands:
230287
- command: expansions.update
231288
params:
@@ -242,9 +299,9 @@ tasks:
242299
build_type: Debug
243300
cc_compiler: gcc
244301
cxx_compiler: g++
245-
- name: compile-only-debian12-gcc-cxx17-debug
246-
run_on: debian12-large
247-
tags: [compile-only, debian12, cxx17, gcc, debug]
302+
- name: compile-only-debian12-latest-gcc-cxx17-debug
303+
run_on: debian12-latest-large
304+
tags: [compile-only, debian12-latest, cxx17, gcc, debug]
248305
commands:
249306
- command: expansions.update
250307
params:
@@ -261,9 +318,9 @@ tasks:
261318
build_type: Debug
262319
cc_compiler: gcc
263320
cxx_compiler: g++
264-
- name: compile-only-debian12-gcc-cxx20-debug
265-
run_on: debian12-large
266-
tags: [compile-only, debian12, cxx20, gcc, debug]
321+
- name: compile-only-debian12-latest-gcc-cxx20-debug
322+
run_on: debian12-latest-large
323+
tags: [compile-only, debian12-latest, cxx20, gcc, debug]
267324
commands:
268325
- command: expansions.update
269326
params:
@@ -558,6 +615,120 @@ tasks:
558615
build_type: Debug
559616
cc_compiler: gcc
560617
cxx_compiler: g++
618+
- name: compile-only-rhel84-clang-cxx11-debug
619+
run_on: rhel84-large
620+
tags: [compile-only, rhel84, cxx11, clang, debug]
621+
commands:
622+
- command: expansions.update
623+
params:
624+
updates:
625+
- { key: build_type, value: Debug }
626+
- { key: cc_compiler, value: clang }
627+
- { key: cxx_compiler, value: clang++ }
628+
- func: setup
629+
- func: install_c_driver
630+
- func: compile
631+
vars:
632+
BUILD_SHARED_AND_STATIC_LIBS: "ON"
633+
REQUIRED_CXX_STANDARD: 11
634+
build_type: Debug
635+
cc_compiler: clang
636+
cxx_compiler: clang++
637+
- name: compile-only-rhel84-clang-cxx17-debug
638+
run_on: rhel84-large
639+
tags: [compile-only, rhel84, cxx17, clang, debug]
640+
commands:
641+
- command: expansions.update
642+
params:
643+
updates:
644+
- { key: build_type, value: Debug }
645+
- { key: cc_compiler, value: clang }
646+
- { key: cxx_compiler, value: clang++ }
647+
- func: setup
648+
- func: install_c_driver
649+
- func: compile
650+
vars:
651+
BUILD_SHARED_AND_STATIC_LIBS: "ON"
652+
REQUIRED_CXX_STANDARD: 17
653+
build_type: Debug
654+
cc_compiler: clang
655+
cxx_compiler: clang++
656+
- name: compile-only-rhel84-clang-cxx20-debug
657+
run_on: rhel84-large
658+
tags: [compile-only, rhel84, cxx20, clang, debug]
659+
commands:
660+
- command: expansions.update
661+
params:
662+
updates:
663+
- { key: build_type, value: Debug }
664+
- { key: cc_compiler, value: clang }
665+
- { key: cxx_compiler, value: clang++ }
666+
- func: setup
667+
- func: install_c_driver
668+
- func: compile
669+
vars:
670+
BUILD_SHARED_AND_STATIC_LIBS: "ON"
671+
REQUIRED_CXX_STANDARD: 20
672+
build_type: Debug
673+
cc_compiler: clang
674+
cxx_compiler: clang++
675+
- name: compile-only-rhel84-gcc-cxx11-debug
676+
run_on: rhel84-large
677+
tags: [compile-only, rhel84, cxx11, gcc, debug]
678+
commands:
679+
- command: expansions.update
680+
params:
681+
updates:
682+
- { key: build_type, value: Debug }
683+
- { key: cc_compiler, value: gcc }
684+
- { key: cxx_compiler, value: g++ }
685+
- func: setup
686+
- func: install_c_driver
687+
- func: compile
688+
vars:
689+
BUILD_SHARED_AND_STATIC_LIBS: "ON"
690+
REQUIRED_CXX_STANDARD: 11
691+
build_type: Debug
692+
cc_compiler: gcc
693+
cxx_compiler: g++
694+
- name: compile-only-rhel84-gcc-cxx17-debug
695+
run_on: rhel84-large
696+
tags: [compile-only, rhel84, cxx17, gcc, debug]
697+
commands:
698+
- command: expansions.update
699+
params:
700+
updates:
701+
- { key: build_type, value: Debug }
702+
- { key: cc_compiler, value: gcc }
703+
- { key: cxx_compiler, value: g++ }
704+
- func: setup
705+
- func: install_c_driver
706+
- func: compile
707+
vars:
708+
BUILD_SHARED_AND_STATIC_LIBS: "ON"
709+
REQUIRED_CXX_STANDARD: 17
710+
build_type: Debug
711+
cc_compiler: gcc
712+
cxx_compiler: g++
713+
- name: compile-only-rhel84-gcc-cxx20-debug
714+
run_on: rhel84-large
715+
tags: [compile-only, rhel84, cxx20, gcc, debug]
716+
commands:
717+
- command: expansions.update
718+
params:
719+
updates:
720+
- { key: build_type, value: Debug }
721+
- { key: cc_compiler, value: gcc }
722+
- { key: cxx_compiler, value: g++ }
723+
- func: setup
724+
- func: install_c_driver
725+
- func: compile
726+
vars:
727+
BUILD_SHARED_AND_STATIC_LIBS: "ON"
728+
REQUIRED_CXX_STANDARD: 20
729+
build_type: Debug
730+
cc_compiler: gcc
731+
cxx_compiler: g++
561732
- name: compile-only-rhel90-clang-cxx11-debug
562733
run_on: rhel90-large
563734
tags: [compile-only, rhel90, cxx11, clang, debug]

0 commit comments

Comments
 (0)