From 206468d721bb3230acc76f8dae33cd1dbdbc7d55 Mon Sep 17 00:00:00 2001 From: Wunkolo Date: Thu, 12 Oct 2023 06:14:57 -0700 Subject: [PATCH] oaknut: CI: Add macos-arm64 build Similar to the msvc-arm64 builds, this will verify a successful build but does not run any of the tests due to the architecture of the runner-images. A later PR may add testing support via qemu which is available on homebrew. --- .github/workflows/build-and-test.yml | 35 ++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 02c0b51..c57dbba 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -45,7 +45,7 @@ jobs: - name: Test working-directory: ${{github.workspace}}/build run: qemu-aarch64 -L /usr/aarch64-linux-gnu ./oaknut-tests -d yes - + test_on_windows: runs-on: windows-latest name: msvc-arm64 @@ -60,7 +60,7 @@ jobs: repository: catchorg/Catch2 ref: v3.2.0 path: externals/catch - + - name: Setup msvc-arm64 environment uses: ilammy/msvc-dev-cmd@v1 with: @@ -76,3 +76,34 @@ jobs: - name: Build working-directory: ${{github.workspace}}/build run: cmake --build . --config Release + + test_on_macos: + runs-on: macos-latest + name: macos-arm64 + + steps: + - name: Checkout oaknut repo + uses: actions/checkout@v3 + + - name: Checkout Catch2 v3 repo + uses: actions/checkout@v3 + with: + repository: catchorg/Catch2 + ref: v3.2.0 + path: externals/catch + + - name: Install dependencies + run: | + brew install ninja + + - name: Configure CMake + run: > + cmake + -B ${{github.workspace}}/build + -GNinja + -DCMAKE_OSX_ARCHITECTURES=arm64 + -DOAKNUT_USE_BUNDLED_CATCH=ON + + - name: Build + working-directory: ${{github.workspace}}/build + run: cmake --build . --config Release