From c9dcc07f5b0d26118f62502302b4f7ac53d00abb Mon Sep 17 00:00:00 2001 From: Neil Henning Date: Wed, 31 Jan 2024 20:32:49 +0000 Subject: [PATCH] Try run on apple silicon. --- .github/workflows/cmake.yml | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 7c772cc..408cb74 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -10,15 +10,20 @@ jobs: build: strategy: matrix: - os: [ubuntu-latest, windows-latest, macOS-latest] + os: [ubuntu-latest, windows-latest, macos-11, macos-14] type: [Debug, RelWithDebInfo, MinSizeRel, Release] - compiler: [default, clang, gcc] + compiler: [default, clang, gcc, tcc] exclude: - - {os: "macOS-latest", compiler: "clang"} - - {os: "windows-latest", compiler: "gcc"} - - {os: "macOS-latest", compiler: "gcc"} + - {os: "macos-11", compiler: "clang"} + - {os: "macos-11", compiler: "gcc"} + - {os: "macos-11", compiler: "tcc"} + - {os: "macos-14", compiler: "clang"} + - {os: "macos-14", compiler: "gcc"} + - {os: "macos-14", compiler: "tcc"} - {os: "ubuntu-latest", compiler: "default"} - {os: "ubuntu-latest", compiler: "default"} + - {os: "windows-latest", compiler: "gcc"} + - {os: "windows-latest", compiler: "tcc"} runs-on: ${{ matrix.os }} steps: @@ -29,7 +34,7 @@ jobs: - name: Setup dependencies if: startsWith(matrix.os, 'ubuntu') - run: sudo apt-get install -y gcc-10 g++-10 clang + run: sudo apt-get install -y gcc-10 g++-10 clang tcc - name: Configure CMake shell: bash @@ -43,6 +48,12 @@ jobs: working-directory: ${{github.workspace}}/build run: cmake $GITHUB_WORKSPACE/test -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_C_COMPILER=gcc-10 -DCMAKE_CXX_COMPILER=g++-10 + - name: Configure CMake with TCC (Ubuntu) + shell: bash + if: matrix.compiler == 'tcc' && startsWith(matrix.os, 'ubuntu') + working-directory: ${{github.workspace}}/build + run: cmake $GITHUB_WORKSPACE/test -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DCMAKE_C_COMPILER=tcc -DCMAKE_CXX_COMPILER=g++-10 + - name: Configure CMake with Clang (Ubuntu) shell: bash if: (matrix.compiler == 'clang') && startsWith(matrix.os, 'ubuntu')