diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 43faa38..58dcedb 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -8,6 +8,7 @@ jobs: name: ${{ matrix.config.name }} runs-on: ubuntu-22.04 strategy: + fail-fast: false matrix: config: - name: linux_gcc_9 @@ -36,27 +37,32 @@ jobs: name: ${{ matrix.config.name }} runs-on: macOS-13 strategy: + fail-fast: false matrix: config: - name: darwin_gcc_9 - compiler: gcc - compiler_version: 9 + brew_package: gcc@9 + cc: /usr/local/opt/gcc@9/bin/gcc-9 + cxx: /usr/local/opt/gcc@9/bin/g++-9 - name: darwin_gcc_12 - compiler: gcc - compiler_version: 12 + brew_package: gcc@12 + cc: /usr/local/opt/gcc@12/bin/gcc-12 + cxx: /usr/local/opt/gcc@12/bin/g++-12 - name: darwin_clang_12 - compiler: clang - compiler_version: 12 + brew_package: llvm@12 + cc: /usr/local/opt/llvm@12/bin/clang + cxx: /usr/local/opt/llvm@12/bin/clang++ - name: darwin_clang_15 - compiler: clang - compiler_version: 15 + brew_package: llvm@15 + cc: /usr/local/opt/llvm@15/bin/clang + cxx: /usr/local/opt/llvm@15/bin/clang++ env: - COMPILER: ${{ matrix.config.compiler }} - VERSION: ${{ matrix.config.compiler_version }} + CC: ${{ matrix.config.cc }} + CXX: ${{ matrix.config.cxx }} steps: - uses: actions/checkout@v4 - name: Install - run: bash ci_scripts/darwin_install_compiler.sh + run: brew install ${{ matrix.config.brew_package }} - name: Build Debug run: make CMAKE_PRESET=Unix_x64_Debug generate build - name: Build Release @@ -67,6 +73,7 @@ jobs: name: ${{ matrix.config.name }} runs-on: ${{ matrix.config.os }} strategy: + fail-fast: false matrix: config: - name: windows_vs_2019 diff --git a/ci_scripts/darwin_install_compiler.sh b/ci_scripts/darwin_install_compiler.sh deleted file mode 100644 index 1292708..0000000 --- a/ci_scripts/darwin_install_compiler.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash -set -x #echo on - -brew update -brew cask uninstall oclint - -upgradeBrewFormula () { - if brew ls --versions $1 > /dev/null - then - brew outdated $1 || brew upgrade $1 - else - brew install $1 - fi -} - - -case "${COMPILER}-${VERSION}" in -gcc-9) - upgradeBrewFormula gcc@9 - ;; -gcc-10) - upgradeBrewFormula gcc@10 - ;; -gcc-11) - upgradeBrewFormula gcc@11 - ;; -gcc-12) - upgradeBrewFormula gcc@12 - ;; -clang-12) - upgradeBrewFormula llvm@12 - # 12 is keg-only, so we have to set the full file path - export CC=/usr/local/opt/llvm@12/bin/clang - export CXX=/usr/local/opt/llvm@12/bin/clang++ - ;; -clang-13) - upgradeBrewFormula llvm@13 - # 13 is keg-only, so we have to set the full file path - export CC=/usr/local/opt/llvm@13/bin/clang - export CXX=/usr/local/opt/llvm@13/bin/clang++ - ;; -clang-14) - upgradeBrewFormula llvm@14 - # 14 is keg-only, so we have to set the full file path - export CC=/usr/local/opt/llvm@14/bin/clang - export CXX=/usr/local/opt/llvm@14/bin/clang++ - ;; -clang-15) - upgradeBrewFormula llvm@15 - # 15 is keg-only, so we have to set the full file path - export CC=/usr/local/opt/llvm@15/bin/clang - export CXX=/usr/local/opt/llvm@15/bin/clang++ - ;; -clang-16) - upgradeBrewFormula llvm@16 - # 16 is keg-only, so we have to set the full file path - export CC=/usr/local/opt/llvm@16/bin/clang - export CXX=/usr/local/opt/llvm@16/bin/clang++ - ;; -*) echo "Compiler not supported: ${COMPILER}-${VERSION}. See travis_ci_install_osx.sh"; exit 1 ;; -esac