From 09844a550d4e4cbd5cb1c63ccb58739441270676 Mon Sep 17 00:00:00 2001 From: Avijit Dey Date: Mon, 25 Sep 2023 13:46:28 +0200 Subject: [PATCH] Set up pipeline for different compiler --- .github/setup.sh | 4 ++-- .github/workflows/cmake.yml | 9 ++------- toolchains/{linux_clang_9.cmake => linux_clang_14.cmake} | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) rename toolchains/{linux_clang_9.cmake => linux_clang_14.cmake} (82%) diff --git a/.github/setup.sh b/.github/setup.sh index 09fb4b7d..70552f28 100644 --- a/.github/setup.sh +++ b/.github/setup.sh @@ -2,7 +2,7 @@ apt-get update -qq # install compilers -apt-get install clang-9 +apt-get install clang-14 # install Boost BOOST_MAJOR_VERSION="1" @@ -22,7 +22,7 @@ DLT_MAJOR_VERSION="2" DLT_MINOR_VERSION="18" DLT_PATCH_VERSION="8" wget "https://github.com/COVESA/dlt-daemon/archive/refs/tags/v${DLT_MAJOR_VERSION}.${DLT_MINOR_VERSION}.${DLT_PATCH_VERSION}.tar.gz" -mkdir dlt-daemon +mkdir dlt-daemon tar -xvf v${DLT_MAJOR_VERSION}.${DLT_MINOR_VERSION}.${DLT_PATCH_VERSION}.tar.gz -C dlt-daemon mkdir -p dlt-daemon/dlt-daemon-${DLT_MAJOR_VERSION}.${DLT_MINOR_VERSION}.${DLT_PATCH_VERSION}/build cd dlt-daemon/dlt-daemon-${DLT_MAJOR_VERSION}.${DLT_MINOR_VERSION}.${DLT_PATCH_VERSION} || exit diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index ca65a1f1..3064cbe0 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -11,19 +11,14 @@ env: BUILD_TYPE: Debug jobs: - Setup: + Build-Clang-14: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Install Dependencies run: sudo sh .github/setup.sh - - Build-Clang-9: - needs: Setup - runs-on: ubuntu-latest - steps: - name: Configure CMake - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=toolchains/linux_clang_9.cmake + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=toolchains/linux_clang_14.cmake - name: Build # Build your program with the given configuration diff --git a/toolchains/linux_clang_9.cmake b/toolchains/linux_clang_14.cmake similarity index 82% rename from toolchains/linux_clang_9.cmake rename to toolchains/linux_clang_14.cmake index 60e97529..3027bd98 100644 --- a/toolchains/linux_clang_9.cmake +++ b/toolchains/linux_clang_14.cmake @@ -1,5 +1,5 @@ set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR x86_64) -set(CMAKE_CXX_COMPILER clang++-9) +set(CMAKE_CXX_COMPILER /usr/bin/clang++-14) set(CMAKE_CXX_FLAGS "-Wall -Werror -Wextra -Wpedantic -Wconversion -Wcast-align -Wunused -Wshadow -Wold-style-cast -Wpointer-arith -Wcast-qual -Wno-missing-braces" CACHE INTERNAL "")