From 8d8b3c84842bc01ee3e84a9d82817759d6a3fcab Mon Sep 17 00:00:00 2001 From: Johan Mabille Date: Tue, 16 Jan 2024 09:59:03 +0100 Subject: [PATCH] Added more compilers --- .github/workflows/ci.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba9a1ed36..458171082 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,14 +15,14 @@ jobs: matrix: runs-on: [ubuntu-latest] sys: - - {compiler: gcc, version: '11', name: c++17, flags: -DCPP17=ON} - {compiler: clang, version: '15', name: assert, flags: -DXTENSOR_ENABLE_ASSERT=ON} - {compiler: clang, version: '16', name: column-major, flags: -DDEFAULT_COLUMN_MAJOR=ON} - - {compiler: default, version: '', name: tbb, flags: -DXTENSOR_USE_TBB=ON -DTBB_INCLUDE_DIR=$CONDA_PREFIX/include -DTBB_LIBRARY=$CONDA_PREFIX/lib} - - {compiler: default, version: '', name: openmp, flags: -DXTENSOR_USE_OPENMP=ON} - - {compiler: default, version: '', name: noexcept, flags: -DXTENSOR_DISABLE_EXCEPTIONS=ON} - - {compiler: default, version: '', name: xsimd, flags: -DXTENSOR_USE_XSIMD=ON} - - {compiler: default, version: '', name: xsimd-tbb, flags: -DXTENSOR_USE_XSIMD=ON -DXTENSOR_USE_TBB=ON} + - {compiler: gcc, version: '7', name: tbb, flags: -DXTENSOR_USE_TBB=ON -DTBB_INCLUDE_DIR=$CONDA_PREFIX/include -DTBB_LIBRARY=$CONDA_PREFIX/lib} + - {compiler: gcc, version: '8', name: openmp, flags: -DXTENSOR_USE_OPENMP=ON} + - {compiler: gcc, version: '9', name: noexcept, flags: -DXTENSOR_DISABLE_EXCEPTIONS=ON} + - {compiler: gcc, version: '10', name: xsimd, flags: -DXTENSOR_USE_XSIMD=ON} + - {compiler: gcc, version: '11', name: c++17, flags: -DCPP17=ON} + - {compiler: gcc, version: '12', name: xsimd-tbb, flags: -DXTENSOR_USE_XSIMD=ON -DXTENSOR_USE_TBB=ON} defaults: run: @@ -35,8 +35,12 @@ jobs: - name: Setup GCC if: ${{ matrix.sys.compiler == 'gcc' }} run: | - echo "CC=gcc-${{ matrix.sys.version }}" >> $GITHUB_ENV - echo "CXX=g++-${{ matrix.sys.version }}" >> $GITHUB_ENV + GCC_VERSION=${{ matrix.sys.version }} + sudo apt-get update + sudo apt-get --no-install-suggests --no-install-recommends install g++-$GCC_VERSION + CC=gcc-$GCC_VERSION + echo "CC=$CC" >> $GITHUB_ENV + CXX=g++-$GCC_VERSION - name: Setup clang if: ${{ matrix.sys.compiler == 'clang' }}