From 6a6f6570be6e199db8c6197919ab808b6196c24b Mon Sep 17 00:00:00 2001 From: "Azamat H. Hackimov" Date: Sun, 21 Apr 2024 20:11:48 +0300 Subject: [PATCH] CI: Add Linux / clang to build matrix --- .github/workflows/build.yml | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4be607665..c76661abc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,10 +12,26 @@ jobs: fail-fast: false matrix: os: - - {runner: windows-latest, preset: win} - - {runner: macos-12, preset: mac} # This is supposed to be Intel for now, and what macos-latest is defaulting to for some reason (as of 04/2024) - - {runner: macos-14, preset: mac} # This is supposed to be M1 - - {runner: ubuntu-latest, preset: linux} + - runner: windows-latest + preset: win + cc: cl + cxx: cl + - runner: macos-12 # This is supposed to be Intel for now, and what macos-latest is defaulting to for some reason (as of 04/2024) + preset: mac + cc: cc + cxx: c++ + - runner: macos-14 # This is supposed to be M1 + preset: mac + cc: cc + cxx: c++ + - runner: ubuntu-latest + preset: linux + cc: gcc + cxx: g++ + - runner: ubuntu-latest + preset: linux + cc: clang + cxx: clang++ runs-on: ${{ matrix.os.runner }} @@ -39,6 +55,9 @@ jobs: mkdir ~/Descent3 - name: Configure CMake + env: + CC: ${{ matrix.os.cc }} + CXX: ${{ matrix.os.cxx }} run: cmake --preset ${{ matrix.os.preset }} - name: Debug Build @@ -50,7 +69,7 @@ jobs: - name: Upload Artifacts uses: actions/upload-artifact@v4 with: - name: build_${{ matrix.os.runner }} + name: build_${{ matrix.os.runner }}_${{ matrix.os.cxx }} path: | ${{ github.workspace }}/builds/${{ matrix.os.preset }}/Descent3/Debug/ ${{ github.workspace }}/builds/${{ matrix.os.preset }}/Descent3/Release/