From 6a94d4d1083694d2099a3c65dafd219cdccce2df Mon Sep 17 00:00:00 2001 From: Serge Lamikhov-Center Date: Wed, 13 Dec 2023 18:17:50 +0200 Subject: [PATCH] Remove C compiler settings --- .github/workflows/c-cpp.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index de8e202..bc03eea 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -15,16 +15,16 @@ jobs: matrix: os: [ubuntu-latest, ubuntu-20.04, windows-latest] build_type: [Release, Debug] - c_compiler: [gcc, clang, cl] + cpp_compiler: [g++, clang++, cl] exclude: - os: windows-latest - c_compiler: gcc + cpp_compiler: g++ - os: windows-latest - c_compiler: clang + cpp_compiler: clang++ - os: ubuntu-latest - c_compiler: cl + cpp_compiler: cl - os: ubuntu-20.04 - c_compiler: cl + cpp_compiler: cl steps: - uses: actions/checkout@v3 @@ -34,13 +34,12 @@ jobs: id: strings shell: bash run: | - echo "build-output-dir=${{ github.workspace }}/build/${{ matrix.build_type }}/${{ matrix.c_compiler }}" >> "$GITHUB_OUTPUT" + echo "build-output-dir=${{ github.workspace }}/build/${{ matrix.build_type }}/${{ matrix.cpp_compiler }}" >> "$GITHUB_OUTPUT" - name: Configure CMake run: > cmake -B ${{ steps.strings.outputs.build-output-dir }} -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} - -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DELFIO_BUILD_EXAMPLES=YES -DELFIO_BUILD_TESTS=YES -S ${{ github.workspace }}