Merge branch 'main' of github.com:cieslarmichal/faker-cxx into featur…

…e/external-deps
cieslarmichal · May 24, 2024 · 9e07e2d · 9e07e2d
2 parents b32bab9 + 3bc4dc1
commit 9e07e2d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/.github/workflows/linux-clang-build.yml b/.github/workflows/linux-clang-build.yml
@@ -12,7 +12,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
@@ -22,24 +22,18 @@ jobs:
 
       - name: Install apt-get dependencies
         run: |
-          sudo add-apt-repository ppa:trebelnik-stefina/launchpad-getkeys \
-           && sudo apt-get update \
-           && sudo apt-get install launchpad-getkeys \
-           && sudo sudo apt-get update \
-           && sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main' \
-           && sudo launchpad-getkeys \
-           && sudo apt-get update -y \
-           && sudo apt-get install -y lld-16 ninja-build build-essential libstdc++-13-dev \
-             clang-16 clang-tools-16 llvm-16 lcov
+          sudo apt -qq update \
+           && sudo apt install -y --no-install-recommends --no-install-suggests ninja-build
 
       - name: Initialize submodules
         run: git submodule update --init --recursive
 
       - name: Configure CMake
         run: |
-          cmake -B ${{github.workspace}}/build \
+          cmake -S ${{github.workspace}} -B ${{github.workspace}}/build \
             -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
-            -DCMAKE_CXX_COMPILER=/usr/bin/clang++-16 \
+            -DCMAKE_C_COMPILER=/usr/bin/clang-18 \
+            -DCMAKE_CXX_COMPILER=/usr/bin/clang++-18 \
             -DCODE_COVERAGE:BOOL=ON \
             -GNinja
 
@@ -50,7 +44,7 @@ jobs:
         working-directory: ${{github.workspace}}/build
         run: |
           ninja faker-ccov-all \
-          && llvm-cov-16 show `cat ccov/binaries.list` -instr-profile=ccov/all-merged.profdata > coverage.txt
+          && llvm-cov-18 show `cat ccov/binaries.list` -instr-profile=ccov/all-merged.profdata > coverage.txt
 
       - name: Codecov
         uses: codecov/[email protected]

diff --git a/cmake/cmake-coverage.cmake b/cmake/cmake-coverage.cmake
@@ -80,8 +80,8 @@ option(
     OFF)
 
 # Programs
-find_program(LLVM_COV_PATH llvm-cov-16)
-find_program(LLVM_PROFDATA_PATH llvm-profdata-16)
+find_program(LLVM_COV_PATH llvm-cov-18)
+find_program(LLVM_PROFDATA_PATH llvm-profdata-18)
 find_program(LCOV_PATH lcov)
 find_program(GENHTML_PATH genhtml)
 # Hide behind the 'advanced' mode flag for GUI/ccmake