Skip to content

Commit 4930d2e

Browse files
Use clang 18/17/16 instead of 15/14/13 (#6978)
1 parent 57b792c commit 4930d2e

File tree

1 file changed

+45
-38
lines changed

1 file changed

+45
-38
lines changed

.github/workflows/osrm-backend.yml

Lines changed: 45 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -177,39 +177,39 @@ jobs:
177177
CXXCOMPILER: g++-13
178178
ENABLE_COVERAGE: ON
179179

180-
- name: clang-15-debug-asan-ubsan
180+
- name: clang-18-debug-asan-ubsan
181181
continue-on-error: false
182182
node: 20
183-
runs-on: ubuntu-22.04
183+
runs-on: ubuntu-24.04
184184
BUILD_TOOLS: ON
185185
BUILD_TYPE: Debug
186-
CCOMPILER: clang-15
186+
CCOMPILER: clang-18
187187
CUCUMBER_TIMEOUT: 20000
188-
CXXCOMPILER: clang++-15
188+
CXXCOMPILER: clang++-18
189189
ENABLE_SANITIZER: ON
190190
TARGET_ARCH: x86_64-asan-ubsan
191191
OSRM_CONNECTION_RETRIES: 10
192192
OSRM_CONNECTION_EXP_BACKOFF_COEF: 1.5
193193

194-
- name: clang-15-release
194+
- name: clang-18-release
195195
continue-on-error: false
196196
node: 18
197-
runs-on: ubuntu-22.04
197+
runs-on: ubuntu-24.04
198198
BUILD_TOOLS: ON
199199
BUILD_TYPE: Release
200-
CCOMPILER: clang-15
201-
CXXCOMPILER: clang++-15
200+
CCOMPILER: clang-18
201+
CXXCOMPILER: clang++-18
202202
CUCUMBER_TIMEOUT: 60000
203203
ENABLE_LTO: OFF
204204

205-
- name: clang-15-debug
205+
- name: clang-18-debug
206206
continue-on-error: false
207207
node: 18
208-
runs-on: ubuntu-22.04
208+
runs-on: ubuntu-24.04
209209
BUILD_TOOLS: ON
210210
BUILD_TYPE: Debug
211-
CCOMPILER: clang-15
212-
CXXCOMPILER: clang++-15
211+
CCOMPILER: clang-18
212+
CXXCOMPILER: clang++-18
213213
CUCUMBER_TIMEOUT: 60000
214214
ENABLE_LTO: OFF
215215

@@ -225,48 +225,48 @@ jobs:
225225
ENABLE_CLANG_TIDY: ON
226226

227227

228-
- name: clang-14-release
228+
- name: clang-17-release
229229
continue-on-error: false
230230
node: 18
231-
runs-on: ubuntu-22.04
231+
runs-on: ubuntu-24.04
232232
BUILD_TOOLS: ON
233233
BUILD_TYPE: Release
234-
CCOMPILER: clang-14
235-
CXXCOMPILER: clang++-14
234+
CCOMPILER: clang-17
235+
CXXCOMPILER: clang++-17
236236
CUCUMBER_TIMEOUT: 60000
237237
ENABLE_LTO: OFF
238238

239-
- name: clang-13-release
239+
- name: clang-16-release
240240
continue-on-error: false
241241
node: 18
242-
runs-on: ubuntu-22.04
242+
runs-on: ubuntu-24.04
243243
BUILD_TOOLS: ON
244244
BUILD_TYPE: Release
245-
CCOMPILER: clang-13
246-
CXXCOMPILER: clang++-13
245+
CCOMPILER: clang-16
246+
CXXCOMPILER: clang++-16
247247
CUCUMBER_TIMEOUT: 60000
248248
ENABLE_LTO: OFF
249249

250250
- name: conan-linux-debug-asan-ubsan
251251
continue-on-error: false
252252
node: 18
253-
runs-on: ubuntu-22.04
253+
runs-on: ubuntu-24.04
254254
BUILD_TOOLS: ON
255255
BUILD_TYPE: Release
256-
CCOMPILER: clang-15
257-
CXXCOMPILER: clang++-15
256+
CCOMPILER: clang-18
257+
CXXCOMPILER: clang++-18
258258
ENABLE_CONAN: ON
259259
ENABLE_SANITIZER: ON
260260
ENABLE_LTO: OFF
261261

262262
- name: conan-linux-release
263263
continue-on-error: false
264264
node: 18
265-
runs-on: ubuntu-22.04
265+
runs-on: ubuntu-24.04
266266
BUILD_TOOLS: ON
267267
BUILD_TYPE: Release
268-
CCOMPILER: clang-15
269-
CXXCOMPILER: clang++-15
268+
CCOMPILER: clang-18
269+
CXXCOMPILER: clang++-18
270270
ENABLE_CONAN: ON
271271
ENABLE_LTO: OFF
272272

@@ -304,21 +304,21 @@ jobs:
304304
build_node_package: true
305305
continue-on-error: false
306306
node: 20
307-
runs-on: ubuntu-22.04
307+
runs-on: ubuntu-24.04
308308
BUILD_TYPE: Release
309-
CCOMPILER: clang-13
310-
CXXCOMPILER: clang++-13
309+
CCOMPILER: clang-16
310+
CXXCOMPILER: clang++-16
311311
ENABLE_CONAN: ON
312312
NODE_PACKAGE_TESTS_ONLY: ON
313313

314314
- name: conan-linux-debug-node
315315
build_node_package: true
316316
continue-on-error: false
317317
node: 20
318-
runs-on: ubuntu-22.04
318+
runs-on: ubuntu-24.04
319319
BUILD_TYPE: Debug
320-
CCOMPILER: clang-13
321-
CXXCOMPILER: clang++-13
320+
CCOMPILER: clang-16
321+
CXXCOMPILER: clang++-16
322322
ENABLE_CONAN: ON
323323
NODE_PACKAGE_TESTS_ONLY: ON
324324

@@ -495,6 +495,13 @@ jobs:
495495
tar zxvf onetbb.tgz
496496
sudo cp -a oneapi-tbb-${TBB_VERSION}/lib/. /usr/local/lib/
497497
sudo cp -a oneapi-tbb-${TBB_VERSION}/include/. /usr/local/include/
498+
- name: Add Clang 18 to list of Conan compilers # workaround for the issue that Conan 1.x doesn't know about Clang 18
499+
if: ${{ matrix.ENABLE_CONAN == 'ON' && matrix.CCOMPILER == 'clang-18' }}
500+
run: |
501+
sudo wget https://github.com/mikefarah/yq/releases/download/v4.9.6/yq_linux_amd64 -O /usr/bin/yq && sudo chmod +x /usr/bin/yq
502+
503+
conan config init
504+
yq eval '.compiler.clang.version += ["18"]' -i "$HOME/.conan/settings.yml"
498505
- name: Prepare build
499506
run: |
500507
mkdir ${OSRM_BUILD_DIR}
@@ -646,12 +653,12 @@ jobs:
646653
benchmarks:
647654
if: github.event_name == 'pull_request'
648655
needs: [format-taginfo-docs]
649-
runs-on: ubuntu-22.04
656+
runs-on: ubuntu-24.04
650657
env:
651-
CCOMPILER: clang-13
652-
CXXCOMPILER: clang++-13
653-
CC: clang-13
654-
CXX: clang++-13
658+
CCOMPILER: clang-16
659+
CXXCOMPILER: clang++-16
660+
CC: clang-16
661+
CXX: clang++-16
655662
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
656663
PR_NUMBER: ${{ github.event.pull_request.number }}
657664
GITHUB_REPOSITORY: ${{ github.repository }}
@@ -686,7 +693,7 @@ jobs:
686693
path: pr
687694
- name: Install dependencies
688695
run: |
689-
python3 -m pip install "conan<2.0.0" "requests==2.31.0" "numpy==1.26.4"
696+
python3 -m pip install "conan<2.0.0" "requests==2.31.0" "numpy==1.26.4" --break-system-packages
690697
sudo apt-get update -y && sudo apt-get install ccache
691698
- name: Prepare data
692699
run: |

0 commit comments

Comments
 (0)