Skip to content

Commit 5079fcc

Browse files
authored
Migrate ABI stability tasks to rhel95 distro (Clang 18) (#1304)
1 parent 8fca624 commit 5079fcc

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

.evergreen/config_generator/components/abi_stability.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def generate_tasks():
147147
if func is Abidiff:
148148
distro_name = 'ubuntu2204' # Clang 12, libabigail is not available on RHEL distros.
149149
else:
150-
distro_name = 'rhel9-latest' # Clang 17.
150+
distro_name = 'rhel95' # Clang 18.
151151

152152
distro = find_large_distro(distro_name)
153153

.evergreen/config_generator/etc/distros.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ def validate_os_ver(cls, value):
8181
Distro(name='rhel87-small', os='rhel', os_type='linux', os_ver='8.7', size='small'),
8282
Distro(name='rhel90-large', os='rhel', os_type='linux', os_ver='9.0', size='large'),
8383
Distro(name='rhel90-small', os='rhel', os_type='linux', os_ver='9.0', size='small'),
84+
Distro(name='rhel95-large', os='rhel', os_type='linux', os_ver='9.5', size='large'),
85+
Distro(name='rhel95-small', os='rhel', os_type='linux', os_ver='9.5', size='small'),
8486

8587
Distro(name='rhel8-latest-large', os='rhel', os_type='linux', os_ver='latest', size='large'),
8688
Distro(name='rhel8-latest-small', os='rhel', os_type='linux', os_ver='latest', size='small'),
87-
Distro(name='rhel9-latest-large', os='rhel', os_type='linux', os_ver='latest', size='large'),
88-
Distro(name='rhel9-latest-small', os='rhel', os_type='linux', os_ver='latest', size='small'),
8989
]
9090

9191
RHEL_ARM64_DISTROS = [

.evergreen/generated_configs/tasks.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,79 @@
11
tasks:
22
- name: abi-compliance-check-impls-cxx11
3-
run_on: rhel9-latest-large
4-
tags: [abi-stability, rhel9-latest, abi-compliance-check, impls, cxx11]
3+
run_on: rhel95-large
4+
tags: [abi-stability, rhel95, abi-compliance-check, impls, cxx11]
55
commands:
66
- func: abi-compliance-check
77
vars:
88
cxx_standard: "11"
99
polyfill: impls
1010
- name: abi-compliance-check-impls-cxx17
11-
run_on: rhel9-latest-large
12-
tags: [abi-stability, rhel9-latest, abi-compliance-check, impls, cxx17]
11+
run_on: rhel95-large
12+
tags: [abi-stability, rhel95, abi-compliance-check, impls, cxx17]
1313
commands:
1414
- func: abi-compliance-check
1515
vars:
1616
cxx_standard: "17"
1717
polyfill: impls
1818
- name: abi-compliance-check-stdlib-cxx17
19-
run_on: rhel9-latest-large
20-
tags: [abi-stability, rhel9-latest, abi-compliance-check, stdlib, cxx17]
19+
run_on: rhel95-large
20+
tags: [abi-stability, rhel95, abi-compliance-check, stdlib, cxx17]
2121
commands:
2222
- func: abi-compliance-check
2323
vars:
2424
cxx_standard: "17"
2525
polyfill: stdlib
2626
- name: abi-compliance-check-stdlib-cxx20
27-
run_on: rhel9-latest-large
28-
tags: [abi-stability, rhel9-latest, abi-compliance-check, stdlib, cxx20]
27+
run_on: rhel95-large
28+
tags: [abi-stability, rhel95, abi-compliance-check, stdlib, cxx20]
2929
commands:
3030
- func: abi-compliance-check
3131
vars:
3232
cxx_standard: "20"
3333
polyfill: stdlib
3434
- name: abi-compliance-check-stdlib-cxx23
35-
run_on: rhel9-latest-large
36-
tags: [abi-stability, rhel9-latest, abi-compliance-check, stdlib, cxx23]
35+
run_on: rhel95-large
36+
tags: [abi-stability, rhel95, abi-compliance-check, stdlib, cxx23]
3737
commands:
3838
- func: abi-compliance-check
3939
vars:
4040
cxx_standard: "23"
4141
polyfill: stdlib
4242
- name: abi-prohibited-symbols-impls-cxx11
43-
run_on: rhel9-latest-large
44-
tags: [abi-stability, rhel9-latest, abi-prohibited-symbols, impls, cxx11]
43+
run_on: rhel95-large
44+
tags: [abi-stability, rhel95, abi-prohibited-symbols, impls, cxx11]
4545
commands:
4646
- func: abi-prohibited-symbols
4747
vars:
4848
cxx_standard: "11"
4949
polyfill: impls
5050
- name: abi-prohibited-symbols-impls-cxx17
51-
run_on: rhel9-latest-large
52-
tags: [abi-stability, rhel9-latest, abi-prohibited-symbols, impls, cxx17]
51+
run_on: rhel95-large
52+
tags: [abi-stability, rhel95, abi-prohibited-symbols, impls, cxx17]
5353
commands:
5454
- func: abi-prohibited-symbols
5555
vars:
5656
cxx_standard: "17"
5757
polyfill: impls
5858
- name: abi-prohibited-symbols-stdlib-cxx17
59-
run_on: rhel9-latest-large
60-
tags: [abi-stability, rhel9-latest, abi-prohibited-symbols, stdlib, cxx17]
59+
run_on: rhel95-large
60+
tags: [abi-stability, rhel95, abi-prohibited-symbols, stdlib, cxx17]
6161
commands:
6262
- func: abi-prohibited-symbols
6363
vars:
6464
cxx_standard: "17"
6565
polyfill: stdlib
6666
- name: abi-prohibited-symbols-stdlib-cxx20
67-
run_on: rhel9-latest-large
68-
tags: [abi-stability, rhel9-latest, abi-prohibited-symbols, stdlib, cxx20]
67+
run_on: rhel95-large
68+
tags: [abi-stability, rhel95, abi-prohibited-symbols, stdlib, cxx20]
6969
commands:
7070
- func: abi-prohibited-symbols
7171
vars:
7272
cxx_standard: "20"
7373
polyfill: stdlib
7474
- name: abi-prohibited-symbols-stdlib-cxx23
75-
run_on: rhel9-latest-large
76-
tags: [abi-stability, rhel9-latest, abi-prohibited-symbols, stdlib, cxx23]
75+
run_on: rhel95-large
76+
tags: [abi-stability, rhel95, abi-prohibited-symbols, stdlib, cxx23]
7777
commands:
7878
- func: abi-prohibited-symbols
7979
vars:

.evergreen/scripts/abi-stability-setup.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ mkdir -p "${working_dir}/install"
6868
export CC CXX
6969
case "${distro_id:?}" in
7070
rhel9*)
71-
CC="clang-17"
72-
CXX="clang++-17"
71+
CC="clang-18"
72+
CXX="clang++-18"
7373
;;
7474
ubuntu22*)
7575
CC="clang-12"
@@ -109,16 +109,16 @@ git -C mongo-cxx-driver reset --hard "${base:?}"
109109

110110
# Install old (base) to install/old.
111111
echo "Building old libraries..."
112-
{
112+
(
113113
"${cmake_binary:?}" \
114114
-S mongo-cxx-driver \
115115
-B build/old \
116116
-DCMAKE_INSTALL_PREFIX=install/old \
117117
-DBUILD_VERSION="${old_ver:?}-base" \
118-
"${configure_flags[@]:?}"
119-
"${cmake_binary:?}" --build build/old
120-
"${cmake_binary:?}" --install build/old
121-
} &>old.log || {
118+
"${configure_flags[@]:?}" || exit
119+
"${cmake_binary:?}" --build build/old || exit
120+
"${cmake_binary:?}" --install build/old || exit
121+
) &>old.log || {
122122
cat old.log 1>&2
123123
exit 1
124124
}
@@ -130,16 +130,16 @@ git -C mongo-cxx-driver stash pop -q || true # Only patch builds have stashed ch
130130

131131
# Install new (current) to install/new.
132132
echo "Building new libraries..."
133-
{
133+
(
134134
"${cmake_binary:?}" \
135135
-S mongo-cxx-driver \
136136
-B build/new \
137137
-DCMAKE_INSTALL_PREFIX=install/new \
138138
-DBUILD_VERSION="${new_ver:?}-current" \
139-
"${configure_flags[@]:?}"
140-
"${cmake_binary:?}" --build build/new
141-
"${cmake_binary:?}" --install build/new
142-
} &>new.log || {
139+
"${configure_flags[@]:?}" || exit
140+
"${cmake_binary:?}" --build build/new || exit
141+
"${cmake_binary:?}" --install build/new || exit
142+
) &>new.log || {
143143
cat new.log 1>&2
144144
exit 1
145145
}

0 commit comments

Comments
 (0)