]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
CI: meson: use builtin handling for MSVC 3858/head
authorEli Schwartz <eschwartz93@gmail.com>
Tue, 2 Jan 2024 06:36:45 +0000 (01:36 -0500)
committerEli Schwartz <eschwartz93@gmail.com>
Tue, 2 Jan 2024 06:36:45 +0000 (01:36 -0500)
This avoids downloading -- and periodically bumping the checksum for --
a third-party action that isn't strictly required, and thus helps keep
down dependencies and reduce update churn.

.github/workflows/dev-short-tests.yml

index 87de8394a9e2fadf2f78305fdf63ce96a2cfaf4b..65e9ae655f962a14359b45e1254dfec9c0c2484a 100644 (file)
@@ -63,7 +63,7 @@ jobs:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v3
     - name: build zstd bin against a dynamic lib (debuglevel for more dependencies)
       run: |
-        make -C lib lib-mt-release 
+        make -C lib lib-mt-release
         DEBUGLEVEL=2 make -C programs zstd-dll
 
   gcc-7-libzstd:
@@ -246,14 +246,12 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v3
       - name: Install packages
         run: pip install --pre meson
-      - name: Initialize the MSVC dev command prompt
-        uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89
       - name: Configure with Meson
         run: |
-          meson setup build/meson/ builddir -Dbin_tests=true -Dbin_programs=true -Dbin_contrib=true
+          meson setup --vsenv build/meson/ builddir -Dbin_tests=true -Dbin_programs=true -Dbin_contrib=true
       - name: Build with Meson
         run: |
-          ninja -C builddir/
+          meson compile -C builddir/
       - name: Test with Meson
         run: |
           meson test -C builddir/ --print-errorlogs