diff --git a/.github/workflows/build-system.yml b/.github/workflows/build-system.yml index 1d7a81223..b897540db 100644 --- a/.github/workflows/build-system.yml +++ b/.github/workflows/build-system.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: configuration: [Debug, Release] - os: [windows-latest, windows-2019, ubuntu-latest, macos-11] + os: [windows-latest, windows-2019, ubuntu-latest, macos-13, macos-14] vulkanVersion: [1.3.231.1] include: - os: ubuntu-latest @@ -28,8 +28,11 @@ jobs: name: Windows - Visual Studio 2019 - os: windows-latest name: Windows - Visual Studio 2022 - - os: macos-11 - name: macOS 11 - Apple-Clang 13 + - os: macos-13 + name: macOS 13 (x64) - Apple-Clang 15 + - os: macos-14 + name: macOS 14 (arm64) - Apple-Clang 15 + args: -DCMAKE_APPLE_SILICON_PROCESSOR="arm64" steps: - name: Checkout Code @@ -66,7 +69,7 @@ jobs: - name: Build NovelRT - ${{ matrix.configuration }} id: build run: | - ${{ matrix.c }} ${{ matrix.cxx }} ${{ matrix.vulkan }} cmake -S . -B build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} + ${{ matrix.c }} ${{ matrix.cxx }} ${{ matrix.vulkan }} cmake -S . -B build -DCMAKE_BUILD_TYPE=${{ matrix.configuration }} ${{ matrix.args }} cmake --build build --config ${{ matrix.configuration }} --target Engine Interop Samples Engine_Tests -j - name: Test NovelRT - ${{ matrix.configuration }} diff --git a/src/NovelRT.Interop/CMakeLists.txt b/src/NovelRT.Interop/CMakeLists.txt index 96ee69762..88c599611 100644 --- a/src/NovelRT.Interop/CMakeLists.txt +++ b/src/NovelRT.Interop/CMakeLists.txt @@ -131,6 +131,7 @@ target_compile_options(Interop $<$:-Wno-padded> $<$:-Wno-reserved-id-macro> $<$:-Wno-nullability-extension> + $<$,$>:-Wno-unused-but-set-variable> $<$:-pedantic> $<$:-pedantic-errors> @@ -143,6 +144,9 @@ target_compile_options(Interop $<$:-Wno-padded> $<$:-Wno-reserved-id-macro> $<$:-Wno-nullability-extension> + $<$,$>:-Wno-unused-but-set-variable> + + ) if(MSVC)