From d8aeb703f0bc782c5cb99fbd14bd3fe4bd091512 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 20 Jul 2023 08:29:05 -0700
Subject: [PATCH] github CI: test meson 0.54.1

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 .github/workflows/on_PR_meson.yaml | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/on_PR_meson.yaml b/.github/workflows/on_PR_meson.yaml
index eece1bad54..dd3044e1ab 100644
--- a/.github/workflows/on_PR_meson.yaml
+++ b/.github/workflows/on_PR_meson.yaml
@@ -19,16 +19,17 @@ jobs:
 
       - name: Install packages
         run: |
-          sudo apt install -y g++-${{matrix.cxx}} libcurl4-gnutls-dev
-          python3 -m pip install meson ninja
+          sudo apt update
+          sudo apt install -y g++-${{matrix.cxx}} libcurl4-gnutls-dev libbrotli-dev libinih-dev libgmock-dev libgtest-dev
+          python3 -m pip install meson==0.54.1 ninja
 
       - name: Compile and Test
         env:
           CXX: g++-${{matrix.cxx}}
         run: |
           meson setup "${{github.workspace}}/build" -Dauto_features=${{matrix.deps}} -Dwarning_level=3
-          meson compile -C "${{github.workspace}}/build" --verbose
-          meson test -C "${{github.workspace}}/build" --verbose
+          meson compile -C "${{github.workspace}}/build"
+          meson test -C "${{github.workspace}}/build"
   Ubuntu-clang:
     runs-on: ubuntu-20.04
     name: Linux-Clang${{matrix.cxx}}-deps=${{matrix.deps}}
@@ -41,8 +42,8 @@ jobs:
 
       - name: Install packages
         run: |
-          sudo apt install -y clang-${{matrix.cxx}} libc++abi-${{matrix.cxx}}-dev libc++-${{matrix.cxx}}-dev lld-${{matrix.cxx}} libcurl4-gnutls-dev
-          python3 -m pip install meson ninja
+          sudo apt install -y clang-${{matrix.cxx}} libc++abi-${{matrix.cxx}}-dev libc++-${{matrix.cxx}}-dev lld-${{matrix.cxx}} libcurl4-gnutls-dev libbrotli-dev libinih-dev libgmock-dev libgtest-dev
+          python3 -m pip install meson==0.54.1 ninja
 
       - name: Compile and Test
         env:
@@ -51,8 +52,8 @@ jobs:
           CXX_LD: lld-${{matrix.cxx}}
         run: |
           meson setup "${{github.workspace}}/build" -Dauto_features=${{matrix.deps}} -Dwarning_level=3 -Dcpp_std=c++20
-          meson compile -C "${{github.workspace}}/build" --verbose
-          meson test -C "${{github.workspace}}/build" --verbose
+          meson compile -C "${{github.workspace}}/build"
+          meson test -C "${{github.workspace}}/build"
   VisualStudio:
     runs-on: windows-latest
     name: MSVC-${{matrix.deps}}-${{matrix.platform}}
@@ -83,14 +84,14 @@ jobs:
       matrix:
         deps: ['enabled', 'disabled']
         platform: ['UCRT64', 'CLANG32', 'CLANG64']
+    env:
+      MSYS: "winjitdebug"
     steps:
       - uses: actions/checkout@v3
 
       - uses: msys2/setup-msys2@v2
         with:
           msystem: ${{matrix.platform}}
-          install: >-
-            dos2unix
           pacboy: >-
             cc:p
             curl:p
@@ -117,14 +118,14 @@ jobs:
 
       - name: Install packages
         run: |
-          brew install curl
-          python3 -m pip install meson ninja
+          brew install curl brotli inih expat
+          python3 -m pip install meson==0.54.1 ninja
 
       - name: Compile and Test
         run: |
           meson setup "${{github.workspace}}/build" -Dauto_features=${{matrix.deps}} -Dwarning_level=3 -Dcpp_std=c++20
-          meson compile -C "${{github.workspace}}/build" --verbose
-          meson test -C "${{github.workspace}}/build" --verbose
+          meson compile -C "${{github.workspace}}/build"
+          meson test -C "${{github.workspace}}/build"
   FreeBSD:
     runs-on: macos-latest
     name: FreeBSD