Skip to content

Commit d8b358e

Browse files
SiarheiFedartsouSiarheiFedartsou
authored
Use apt-get to install Clang on CI (#6345)
1 parent b4142cf commit d8b358e

File tree

2 files changed

+40
-29
lines changed

2 files changed

+40
-29
lines changed

‎.github/workflows/osrm-backend.yml

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ jobs:
138138
runs-on: ubuntu-20.04
139139
BUILD_TOOLS: ON
140140
BUILD_TYPE: Debug
141-
CLANG_VERSION: 6.0.0
141+
CCOMPILER: clang-6.0
142+
CXXCOMPILER: clang++-6.0
142143
CUCUMBER_TIMEOUT: 60000
143144

144145
- name: clang-11.0-debug-clang-tidy
@@ -147,7 +148,8 @@ jobs:
147148
runs-on: ubuntu-20.04
148149
BUILD_TOOLS: ON
149150
BUILD_TYPE: Debug
150-
CLANG_VERSION: 11.0.0
151+
CCOMPILER: clang-11
152+
CXXCOMPILER: clang++-11
151153
CUCUMBER_TIMEOUT: 60000
152154
ENABLE_CLANG_TIDY: ON
153155

@@ -157,7 +159,8 @@ jobs:
157159
runs-on: ubuntu-20.04
158160
BUILD_TOOLS: ON
159161
BUILD_TYPE: Release
160-
CLANG_VERSION: 11.0.0
162+
CCOMPILER: clang-11
163+
CXXCOMPILER: clang++-11
161164
ENABLE_CONAN: ON
162165
ENABLE_SANITIZER: ON
163166

@@ -167,7 +170,8 @@ jobs:
167170
runs-on: ubuntu-20.04
168171
BUILD_TOOLS: ON
169172
BUILD_TYPE: Release
170-
CLANG_VERSION: 6.0.0
173+
CCOMPILER: clang-6.0
174+
CXXCOMPILER: clang++-6.0
171175
ENABLE_CONAN: ON
172176

173177
- name: gcc-11-release
@@ -285,7 +289,8 @@ jobs:
285289
node: 12
286290
runs-on: ubuntu-20.04
287291
BUILD_TYPE: Release
288-
CLANG_VERSION: 6.0.0
292+
CCOMPILER: clang-6.0
293+
CXXCOMPILER: clang++-6.0
289294
ENABLE_GLIBC_WORKAROUND: ON
290295
ENABLE_CONAN: ON
291296
NODE_PACKAGE_TESTS_ONLY: ON
@@ -296,7 +301,8 @@ jobs:
296301
node: 12
297302
runs-on: ubuntu-20.04
298303
BUILD_TYPE: Debug
299-
CLANG_VERSION: 6.0.0
304+
CCOMPILER: clang-6.0
305+
CXXCOMPILER: clang++-6.0
300306
ENABLE_GLIBC_WORKAROUND: ON
301307
ENABLE_CONAN: ON
302308
NODE_PACKAGE_TESTS_ONLY: ON
@@ -307,7 +313,8 @@ jobs:
307313
node: 14
308314
runs-on: ubuntu-20.04
309315
BUILD_TYPE: Release
310-
CLANG_VERSION: 6.0.0
316+
CCOMPILER: clang-6.0
317+
CXXCOMPILER: clang++-6.0
311318
ENABLE_GLIBC_WORKAROUND: ON
312319
ENABLE_CONAN: ON
313320
NODE_PACKAGE_TESTS_ONLY: ON
@@ -318,7 +325,8 @@ jobs:
318325
node: 14
319326
runs-on: ubuntu-20.04
320327
BUILD_TYPE: Debug
321-
CLANG_VERSION: 6.0.0
328+
CCOMPILER: clang-6.0
329+
CXXCOMPILER: clang++-6.0
322330
ENABLE_GLIBC_WORKAROUND: ON
323331
ENABLE_CONAN: ON
324332
NODE_PACKAGE_TESTS_ONLY: ON
@@ -330,7 +338,8 @@ jobs:
330338
node: 16
331339
runs-on: ubuntu-20.04
332340
BUILD_TYPE: Release
333-
CLANG_VERSION: 6.0.0
341+
CCOMPILER: clang-6.0
342+
CXXCOMPILER: clang++-6.0
334343
ENABLE_GLIBC_WORKAROUND: ON
335344
ENABLE_CONAN: ON
336345
NODE_PACKAGE_TESTS_ONLY: ON
@@ -341,7 +350,8 @@ jobs:
341350
node: 16
342351
runs-on: ubuntu-20.04
343352
BUILD_TYPE: Debug
344-
CLANG_VERSION: 6.0.0
353+
CCOMPILER: clang-6.0
354+
CXXCOMPILER: clang++-6.0
345355
ENABLE_GLIBC_WORKAROUND: ON
346356
ENABLE_CONAN: ON
347357
NODE_PACKAGE_TESTS_ONLY: ON
@@ -364,7 +374,8 @@ jobs:
364374
node: latest
365375
runs-on: ubuntu-20.04
366376
BUILD_TYPE: Release
367-
CLANG_VERSION: 6.0.0
377+
CCOMPILER: clang-6.0
378+
CXXCOMPILER: clang++-6.0
368379
ENABLE_GLIBC_WORKAROUND: ON
369380
ENABLE_CONAN: ON
370381
NODE_PACKAGE_TESTS_ONLY: ON
@@ -375,7 +386,8 @@ jobs:
375386
node: latest
376387
runs-on: ubuntu-20.04
377388
BUILD_TYPE: Debug
378-
CLANG_VERSION: 6.0.0
389+
CCOMPILER: clang-6.0
390+
CXXCOMPILER: clang++-6.0
379391
ENABLE_GLIBC_WORKAROUND: ON
380392
ENABLE_CONAN: ON
381393
NODE_PACKAGE_TESTS_ONLY: ON
@@ -398,7 +410,8 @@ jobs:
398410
node: "lts/*"
399411
runs-on: ubuntu-20.04
400412
BUILD_TYPE: Release
401-
CLANG_VERSION: 6.0.0
413+
CCOMPILER: clang-6.0
414+
CXXCOMPILER: clang++-6.0
402415
ENABLE_GLIBC_WORKAROUND: ON
403416
ENABLE_CONAN: ON
404417
NODE_PACKAGE_TESTS_ONLY: ON
@@ -409,7 +422,8 @@ jobs:
409422
node: "lts/*"
410423
runs-on: ubuntu-20.04
411424
BUILD_TYPE: Debug
412-
CLANG_VERSION: 6.0.0
425+
CCOMPILER: clang-6.0
426+
CXXCOMPILER: clang++-6.0
413427
ENABLE_GLIBC_WORKAROUND: ON
414428
ENABLE_CONAN: ON
415429
NODE_PACKAGE_TESTS_ONLY: ON
@@ -423,7 +437,6 @@ jobs:
423437
BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS }}
424438
CCOMPILER: ${{ matrix.CCOMPILER }}
425439
CFLAGS: ${{ matrix.CFLAGS }}
426-
CLANG_VERSION: ${{ matrix.CLANG_VERSION }}
427440
CUCUMBER_TIMEOUT: ${{ matrix.CUCUMBER_TIMEOUT }}
428441
CXXCOMPILER: ${{ matrix.CXXCOMPILER }}
429442
CXXFLAGS: ${{ matrix.CXXFLAGS }}
@@ -515,26 +528,23 @@ jobs:
515528
echo "$(${MASON} prefix ccache ${CCACHE_VERSION})/bin" >> $GITHUB_PATH
516529
517530
# clang
518-
if [[ -n ${CLANG_VERSION} ]]; then
519-
echo "CCOMPILER=clang" >> $GITHUB_ENV
520-
echo "CXXCOMPILER=clang++" >> $GITHUB_ENV
521-
${MASON} install clang++ ${CLANG_VERSION}
522-
echo "$(${MASON} prefix clang++ ${CLANG_VERSION})/bin" >> $GITHUB_PATH
523-
# we only enable lto for release builds
524-
# and therefore don't need to us ld.gold or llvm tools for linking
525-
# for debug builds
526-
if [[ ${BUILD_TYPE} == 'Release' ]]; then
527-
${MASON} install binutils 2.27
528-
echo "$(${MASON} prefix binutils 2.27)/bin" >> $GITHUB_PATH
529-
fi
531+
if [[ "${CCOMPILER}" == "clang-6.0" ]]; then
532+
sudo apt-get update -y && sudo apt-get install clang++-6
530533
fi
531-
534+
# we only enable lto for release builds
535+
# and therefore don't need to us ld.gold or llvm tools for linking
536+
# for debug builds
537+
if [[ "${CCOMPILER}" == clang-* ]] && [[ ${BUILD_TYPE} == 'Release' ]]; then
538+
${MASON} install binutils 2.27
539+
echo "$(${MASON} prefix binutils 2.27)/bin" >> $GITHUB_PATH
540+
fi
541+
532542
# Linux dev packages
533543
if [ "${TARGET_ARCH}" != "i686" ] && [ "${ENABLE_CONAN}" != "ON" ]; then
534544
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
535545
sudo apt-get update -y
536546
sudo apt-get install -y libbz2-dev libxml2-dev libzip-dev liblua5.2-dev libboost-all-dev
537-
if [[ -z "${CLANG_VERSION}" ]]; then
547+
if [[ "${CCOMPILER}" != clang-* ]]; then
538548
sudo apt-get install -y ${CXXCOMPILER}
539549
fi
540550
if [[ "${ENABLE_COVERAGE}" == "ON" ]]; then

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
- FIXED: Bug in bicycle profile that caused exceptions if there is a highway=bicycle in the data. [#6296](https://github.com/Project-OSRM/osrm-backend/pull/6296)
2121
- FIXED: Internal refactoring of identifier types used in data facade [#6044](https://github.com/Project-OSRM/osrm-backend/pull/6044)
2222
- Build:
23+
- CHANGED: Use apt-get to install Clang on CI. [#6345](https://github.com/Project-OSRM/osrm-backend/pull/6345)
2324
- CHANGED: Fix TBB in case of Conan + NodeJS build. [#6333](https://github.com/Project-OSRM/osrm-backend/pull/6333)
2425
- CHANGED: Migrate to modern TBB version. [#6300](https://github.com/Project-OSRM/osrm-backend/pull/6300)
2526
- CHANGED: Enable performance-move-const-arg clang-tidy check. [#6319](https://github.com/Project-OSRM/osrm-backend/pull/6319)

0 commit comments

Comments
 (0)