Set C++ compiler in CI as well

Duh
This commit is contained in:
ISSOtm
2022-03-10 00:37:16 +01:00
committed by Eldred Habert
parent c82cce6d95
commit b9de65c9a2

View File

@@ -16,6 +16,11 @@ jobs:
cc: gcc cc: gcc
- os: macos-11.0 - os: macos-11.0
cc: gcc cc: gcc
include:
- cc: gcc
cxx: g++
- cc: clang
cxx: clang++
fail-fast: false fail-fast: false
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
@@ -30,13 +35,13 @@ jobs:
- name: Build & install using Make - name: Build & install using Make
run: | run: |
export PATH="/usr/local/opt/bison/bin:$PATH" 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= sudo make install -j Q=
if: matrix.buildsys == 'make' if: matrix.buildsys == 'make'
- name: Build & install using CMake - name: Build & install using CMake
run: | run: |
export PATH="/usr/local/opt/bison/bin:$PATH" 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 cmake --build build -j
cp build/src/rgb{asm,link,fix,gfx} . cp build/src/rgb{asm,link,fix,gfx} .
sudo cmake --install build sudo cmake --install build