From b9de65c9a2f2f6377394bf7ac09267ad6618b1a9 Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Thu, 10 Mar 2022 00:37:16 +0100 Subject: [PATCH] Set C++ compiler in CI as well Duh --- .github/workflows/testing.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 0237adb4..c668b08f 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -16,6 +16,11 @@ jobs: cc: gcc - os: macos-11.0 cc: gcc + include: + - cc: gcc + cxx: g++ + - cc: clang + cxx: clang++ fail-fast: false runs-on: ${{ matrix.os }} steps: @@ -30,13 +35,13 @@ jobs: - name: Build & install using Make run: | export PATH="/usr/local/opt/bison/bin:$PATH" - make develop -j Q= CC=${{ matrix.cc }} + make develop -j Q= CC=${{ matrix.cc }} CXX=${{ matrix.cxx }} sudo make install -j Q= if: matrix.buildsys == 'make' - name: Build & install using CMake run: | export PATH="/usr/local/opt/bison/bin:$PATH" - cmake -S . -B build -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=${{ matrix.cc }} -DSANITIZERS=ON -DMORE_WARNINGS=ON + cmake -S . -B build -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=${{ matrix.cc }} -DCMAKE_CXX_COMPILER=${{ matrix.cxx }} -DSANITIZERS=ON -DMORE_WARNINGS=ON cmake --build build -j cp build/src/rgb{asm,link,fix,gfx} . sudo cmake --install build