From f3fd711a23a720fb151c7571facc2d5fbb66723d Mon Sep 17 00:00:00 2001 From: dragonmux Date: Fri, 18 Oct 2024 12:38:16 +0100 Subject: [PATCH] github: Switched the MinGW/MSYS2 builds to using Meson for PR checking --- .github/workflows/build-pr.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 2d785af33d5..937315a89b0 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -228,6 +228,7 @@ jobs: path-type: inherit pacboy: >- toolchain:p + meson:p # Build a suitable runtime environment - name: Runtime environment @@ -260,27 +261,23 @@ jobs: shell: bash run: | $CC --version - make --version + meson --version + ninja --version # Checkout the repository and branch to build under the default location - name: Checkout uses: actions/checkout@v4 - # Build BMDA in BMP-only mode - - name: Build BMP only BMDA - run: make PROBE_HOST=hosted HOSTED_BMP_ONLY=1 - - - name: Clean - run: make -C src clean - - # Install the dependencies needed for a full BMDA build + # Install the dependencies needed for a BMDA build - name: Install BMDA dependencies run: | pacman --noconfirm -S mingw-w64-${{matrix.sys.env}}-libusb mingw-w64-${{matrix.sys.env}}-hidapi # And build that full binary - - name: Build full BMDA - run: make PROBE_HOST=hosted HOSTED_BMP_ONLY=0 + - name: Build BMDA with MSYS2-provided dependencies + run: | + meson setup build + meson compile -C build # This workflow tests the experimental Meson build system build-linux-meson: