Skip to content

Commit 08243ff

Browse files
authored
Merge pull request #34 from open-telemetry/main
[CI] Upgrade Maintainers CI to ubuntu-24.04 (open-telemetry#2670)
2 parents 7653d36 + 4edcebd commit 08243ff

File tree

2 files changed

+39
-34
lines changed

2 files changed

+39
-34
lines changed

.github/workflows/ci.yml

+30-30
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,25 @@ jobs:
2929
./ci/do_ci.sh cmake.test
3030
3131
cmake_gcc_maintainer_sync_test:
32-
name: CMake gcc 13 (maintainer mode, sync)
33-
runs-on: ubuntu-latest
32+
name: CMake gcc 14 (maintainer mode, sync)
33+
runs-on: ubuntu-24.04
3434
steps:
3535
- uses: actions/checkout@v4
3636
with:
3737
submodules: 'recursive'
3838
- name: setup
3939
env:
40-
CC: /usr/bin/gcc-13
41-
CXX: /usr/bin/g++-13
40+
CC: /usr/bin/gcc-14
41+
CXX: /usr/bin/g++-14
4242
PROTOBUF_VERSION: 21.12
4343
run: |
4444
sudo -E ./ci/setup_googletest.sh
4545
sudo -E ./ci/setup_ci_environment.sh
4646
sudo -E ./ci/install_protobuf.sh
4747
- name: run cmake gcc (maintainer mode, sync)
4848
env:
49-
CC: /usr/bin/gcc-13
50-
CXX: /usr/bin/g++-13
49+
CC: /usr/bin/gcc-14
50+
CXX: /usr/bin/g++-14
5151
run: |
5252
./ci/do_ci.sh cmake.maintainer.sync.test
5353
- name: generate test cert
@@ -61,25 +61,25 @@ jobs:
6161
(cd ./functional/otlp; ./run_test.sh)
6262
6363
cmake_gcc_maintainer_async_test:
64-
name: CMake gcc 13 (maintainer mode, async)
65-
runs-on: ubuntu-latest
64+
name: CMake gcc 14 (maintainer mode, async)
65+
runs-on: ubuntu-24.04
6666
steps:
6767
- uses: actions/checkout@v4
6868
with:
6969
submodules: 'recursive'
7070
- name: setup
7171
env:
72-
CC: /usr/bin/gcc-13
73-
CXX: /usr/bin/g++-13
72+
CC: /usr/bin/gcc-14
73+
CXX: /usr/bin/g++-14
7474
PROTOBUF_VERSION: 21.12
7575
run: |
7676
sudo -E ./ci/setup_googletest.sh
7777
sudo -E ./ci/setup_ci_environment.sh
7878
sudo -E ./ci/install_protobuf.sh
7979
- name: run cmake gcc (maintainer mode, async)
8080
env:
81-
CC: /usr/bin/gcc-13
82-
CXX: /usr/bin/g++-13
81+
CC: /usr/bin/gcc-14
82+
CXX: /usr/bin/g++-14
8383
run: |
8484
./ci/do_ci.sh cmake.maintainer.async.test
8585
- name: generate test cert
@@ -93,25 +93,25 @@ jobs:
9393
(cd ./functional/otlp; ./run_test.sh)
9494
9595
cmake_clang_maintainer_sync_test:
96-
name: CMake clang 15 (maintainer mode, sync)
97-
runs-on: ubuntu-latest
96+
name: CMake clang 18 (maintainer mode, sync)
97+
runs-on: ubuntu-24.04
9898
steps:
9999
- uses: actions/checkout@v4
100100
with:
101101
submodules: 'recursive'
102102
- name: setup
103103
env:
104-
CC: /usr/bin/clang-15
105-
CXX: /usr/bin/clang++-15
104+
CC: /usr/bin/clang-18
105+
CXX: /usr/bin/clang++-18
106106
PROTOBUF_VERSION: 21.12
107107
run: |
108108
sudo -E ./ci/setup_googletest.sh
109109
sudo -E ./ci/setup_ci_environment.sh
110110
sudo -E ./ci/install_protobuf.sh
111111
- name: run cmake clang (maintainer mode, sync)
112112
env:
113-
CC: /usr/bin/clang-15
114-
CXX: /usr/bin/clang++-15
113+
CC: /usr/bin/clang-18
114+
CXX: /usr/bin/clang++-18
115115
run: |
116116
./ci/do_ci.sh cmake.maintainer.sync.test
117117
- name: generate test cert
@@ -125,25 +125,25 @@ jobs:
125125
(cd ./functional/otlp; ./run_test.sh)
126126
127127
cmake_clang_maintainer_async_test:
128-
name: CMake clang 15 (maintainer mode, async)
129-
runs-on: ubuntu-latest
128+
name: CMake clang 18 (maintainer mode, async)
129+
runs-on: ubuntu-24.04
130130
steps:
131131
- uses: actions/checkout@v4
132132
with:
133133
submodules: 'recursive'
134134
- name: setup
135135
env:
136-
CC: /usr/bin/clang-15
137-
CXX: /usr/bin/clang++-15
136+
CC: /usr/bin/clang-18
137+
CXX: /usr/bin/clang++-18
138138
PROTOBUF_VERSION: 21.12
139139
run: |
140140
sudo -E ./ci/setup_googletest.sh
141141
sudo -E ./ci/setup_ci_environment.sh
142142
sudo -E ./ci/install_protobuf.sh
143143
- name: run cmake clang (maintainer mode, async)
144144
env:
145-
CC: /usr/bin/clang-15
146-
CXX: /usr/bin/clang++-15
145+
CC: /usr/bin/clang-18
146+
CXX: /usr/bin/clang++-18
147147
run: |
148148
./ci/do_ci.sh cmake.maintainer.async.test
149149
- name: generate test cert
@@ -157,25 +157,25 @@ jobs:
157157
(cd ./functional/otlp; ./run_test.sh)
158158
159159
cmake_clang_maintainer_abiv2_test:
160-
name: CMake clang 15 (maintainer mode, abiv2)
161-
runs-on: ubuntu-latest
160+
name: CMake clang 18 (maintainer mode, abiv2)
161+
runs-on: ubuntu-24.04
162162
steps:
163163
- uses: actions/checkout@v4
164164
with:
165165
submodules: 'recursive'
166166
- name: setup
167167
env:
168-
CC: /usr/bin/clang-15
169-
CXX: /usr/bin/clang++-15
168+
CC: /usr/bin/clang-18
169+
CXX: /usr/bin/clang++-18
170170
PROTOBUF_VERSION: 21.12
171171
run: |
172172
sudo -E ./ci/setup_googletest.sh
173173
sudo -E ./ci/setup_ci_environment.sh
174174
sudo -E ./ci/install_protobuf.sh
175175
- name: run cmake clang (maintainer mode, abiv2)
176176
env:
177-
CC: /usr/bin/clang-15
178-
CXX: /usr/bin/clang++-15
177+
CC: /usr/bin/clang-18
178+
CXX: /usr/bin/clang++-18
179179
run: |
180180
./ci/do_ci.sh cmake.maintainer.abiv2.test
181181
- name: generate test cert

ci/do_ci.sh

+9-4
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,15 @@ mkdir -p "${PLUGIN_DIR}"
6565

6666
IWYU=""
6767
MAKE_COMMAND="make -k -j \$(nproc)"
68-
if [[ "${CXX}" == *clang* ]]; then
69-
MAKE_COMMAND="make -k CXX=include-what-you-use CXXFLAGS=\"-Xiwyu --error_always\" -j \$(nproc)"
70-
IWYU="-DCMAKE_CXX_INCLUDE_WHAT_YOU_USE=iwyu"
71-
fi
68+
69+
# Temporarily disable the IWYU build.
70+
# It fails in Ubuntu 24-04 CI with:
71+
# Error running 'iwyu': Segmentation fault
72+
#
73+
# if [[ "${CXX}" == *clang* ]]; then
74+
# MAKE_COMMAND="make -k CXX=include-what-you-use CXXFLAGS=\"-Xiwyu --error_always\" -j \$(nproc)"
75+
# IWYU="-DCMAKE_CXX_INCLUDE_WHAT_YOU_USE=iwyu"
76+
# fi
7277

7378
echo "make command: ${MAKE_COMMAND}"
7479
echo "IWYU option: ${IWYU}"

0 commit comments

Comments
 (0)