From 72df9d21abe8e776cf63288a91b65bcb6b88d1d4 Mon Sep 17 00:00:00 2001 From: Zephyr Lykos Date: Thu, 19 Sep 2024 23:15:06 +0800 Subject: [PATCH] fixup! ci: add meson support --- .github/workflows/main.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d083a377..e1f91ed4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -96,14 +96,13 @@ jobs: - name: Checkout uses: actions/checkout@v4 with: { submodules: recursive } - - name: Activate MSVC + - name: Activate MSVC and Configure if: ${{ matrix.platform == 'windows-2022' }} - shell: powershell + env: ${{ matrix.extra_envs }} run: | - $VCPATH = vswhere -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath -latest - & $VCPATH\VC\Auxiliary\Build\vcvars64.bat + meson setup build-${{ matrix.flavor }} ${{ matrix.mode.args }} --vsenv - name: Configuring - env: ${{ matrix.extra_envs }} + if: ${{ matrix.platform != 'windows-2022' }} run: | meson setup build-${{ matrix.flavor }} ${{ matrix.mode.args }} - name: Building