Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into class-to-struct
Browse files Browse the repository at this point in the history
  • Loading branch information
kring committed Nov 19, 2024
2 parents dfaf78e + 9047047 commit fd22a9c
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ jobs:
fail-fast: false
matrix:
compiler: [ gcc, clang ]
platform: [ ubuntu-22.04, ubuntu-20.04, macos-12 ]
platform: [ ubuntu-22.04, ubuntu-20.04, macos-15 ]
build_type: [Debug, RelWithDebInfo]
exclude:
- compiler: clang
platform: ubuntu-22.04
platform: ubuntu-22.04
- compiler: gcc
platform: macos-12
platform: macos-15
- compiler: gcc
platform: ubuntu-20.04
name: "${{matrix.platform}} / ${{matrix.compiler}} / ${{matrix.build_type}}"
Expand Down Expand Up @@ -111,13 +111,17 @@ jobs:
vcpkg-${{ env.CACHE_KEY }}-${{ hashFiles('CMakeLists.txt') }}
vcpkg-${{ env.CACHE_KEY }}
- name: Set CC and CXX
if: ${{ matrix.compiler == 'clang' && matrix.platform != 'macos-12'}}
if: ${{ matrix.compiler == 'clang' && matrix.platform != 'macos-15'}}
run: |
echo "CC=clang-12" >> "$GITHUB_ENV"
echo "CXX=clang++-12" >> "$GITHUB_ENV"
- name: Set macOS cmake options
if: ${{ matrix.platform == 'macos-15' }}
run: |
echo "EXTRA_CMAKE_OPTIONS=-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_SYSTEM_PROCESSOR=x86_64" >> "$GITHUB_ENV"
- name: Compile ${{matrix.build_type}} Configuration
run: |
cmake -B build -S . -DCMAKE_BUILD_TYPE:STRING=${{matrix.build_type}}
cmake -B build -S . -DCMAKE_BUILD_TYPE:STRING=${{matrix.build_type}} $EXTRA_CMAKE_OPTIONS
cmake --build build --parallel
- name: Test ${{matrix.build_type}} Configuration
run: |
Expand Down

0 comments on commit fd22a9c

Please sign in to comment.