fixup! ci: add meson support

zyantific · Sep 19, 2024 · 6a383f5 · 6a383f5
1 parent f7ae3e5
commit 6a383f5
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -77,7 +77,7 @@ jobs:
             mode:
               {
                 name: minimal,
-                args: -Dminimal=enabled -Dencoder=enabled -Davx512=enabled -Dknc=enabled -Dsegment=enabled -Dtests=enabled,
+                args: -Dminimal=enabled -Ddecoder=enabled -Davx512=enabled -Dknc=enabled -Dsegment=enabled -Dtests=enabled,
               }
             extra_envs: {}
             flavor: minsize
@@ -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