Update CI

jibsen · Nov 1, 2023 · a97a957 · a97a957
1 parent d0e6845
commit a97a957
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/.github/workflows/meson-ci-workflow.yaml b/.github/workflows/meson-ci-workflow.yaml
@@ -17,26 +17,20 @@ jobs:
             arch: amd64
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v4
         with:
           python-version: '3.x'
 
       - name: Install Meson
         run: pip install meson ninja
 
       - name: Configure
-        shell: cmd
-        run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -no_logo -arch=${{ matrix.config.arch }}
-          meson setup build
+        run: meson setup --vsenv build
 
       - name: Build
-        shell: cmd
-        run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -no_logo -arch=${{ matrix.config.arch }}
-          ninja -C build
+        run: meson compile -C build -v
 
   linux:
     name: Linux ${{ matrix.config.name }}
@@ -57,9 +51,9 @@ jobs:
             cxx: clang++
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v4
         with:
           python-version: '3.x'
 
@@ -70,4 +64,4 @@ jobs:
         run: meson setup build
 
       - name: Build
-        run: ninja -C build
+        run: meson compile -C build -v
diff --git a/meson.build b/meson.build
@@ -1,5 +1,5 @@
 project('blz4', 'c',
-  meson_version : '>=0.45.0',
+  meson_version : '>=0.60.0',
   default_options : [
     'b_ndebug=if-release',
     'buildtype=release',