From 3cf1afdf80686e41ba23f839a0c5ded9bb14f813 Mon Sep 17 00:00:00 2001 From: Daniel Svensson Date: Tue, 12 Mar 2024 21:43:16 +0100 Subject: [PATCH] CI: Use the new cmake build on macOS. --- .github/workflows/build-targets.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-targets.yml b/.github/workflows/build-targets.yml index 63b44224c..12b4c4b8c 100644 --- a/.github/workflows/build-targets.yml +++ b/.github/workflows/build-targets.yml @@ -50,26 +50,26 @@ jobs: runs-on: macos-13 strategy: matrix: - ARCH: ["arm64","intel"] + preset: [xcode-vcpkg-x64, xcode-vcpkg-arm64] + variant: [release] + steps: - name: Check out code uses: actions/checkout@v3 with: submodules: true - - name: Install dependencies - run: .github/workflows/scripts/homebrew.sh install-${{matrix.ARCH}} - - - name: Build - run: .github/workflows/scripts/homebrew.sh build-${{matrix.ARCH}} + - name: Install build system dependencies + run: brew install autoconf automake libtool - - name: Create Bundle - run: .github/workflows/scripts/homebrew.sh create-bundle ${{matrix.ARCH}} + - name: Setup vcpkg + uses: lukka/run-vcpkg@v11 - - uses: actions/upload-artifact@v3 + - name: Run CMake + uses: lukka/run-cmake@v10 with: - name: macos-${{matrix.ARCH}} - path: ezQuake.zip + configurePreset: "${{ matrix.preset }}-${{ matrix.variant }}" + buildPreset: "${{ matrix.preset }}-${{ matrix.variant }}" linux-build: runs-on: ubuntu-latest