From 923cf3dc9289d00b668cd0a330d5c28f22d4837f Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Tue, 2 Jan 2024 01:36:45 -0500 Subject: [PATCH] CI: meson: use builtin handling for MSVC 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 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml index 87de8394a..65e9ae655 100644 --- a/.github/workflows/dev-short-tests.yml +++ b/.github/workflows/dev-short-tests.yml @@ -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 -- 2.47.2