From c5a53755275819e9af60b56331857390b34743cd Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 19 Feb 2023 17:58:26 -0800 Subject: [PATCH] meson CI: build for 32-bit Windows too Signed-off-by: Rosen Penev --- .github/workflows/on_PR_meson.yaml | 12 ++++++++---- .github/workflows/on_PR_meson_clang.yaml | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/on_PR_meson.yaml b/.github/workflows/on_PR_meson.yaml index 90d6c2a2..2a1eb5fe 100644 --- a/.github/workflows/on_PR_meson.yaml +++ b/.github/workflows/on_PR_meson.yaml @@ -23,7 +23,7 @@ jobs: sudo apt install -y g++-${{matrix.cxx}} python3 -m pip install meson ninja - - name: Sanity Checks + - name: Compile and Test env: CXX: g++-${{matrix.cxx}} run: | @@ -33,10 +33,11 @@ jobs: VisualStudio: runs-on: windows-latest - name: MSVC-${{matrix.deps}}-${{matrix.type}} + name: MSVC-${{matrix.deps}}-${{matrix.type}}-${{matrix.platform}} strategy: matrix: deps: ['forcefallback', 'default'] + platform: ['x64', 'x86'] type: ['shared', 'static'] steps: - uses: actions/checkout@v3 @@ -46,7 +47,10 @@ jobs: python -m pip install meson ninja - uses: ilammy/msvc-dev-cmd@v1 - - name: Sanity Checks + with: + arch: ${{matrix.platform}} + + - name: Compile and Test run: | meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Ddefault_library=${{matrix.type}} -Dwarning_level=3 -Dcpp_std=c++20 meson compile -C "${{github.workspace}}/build" --verbose @@ -66,7 +70,7 @@ jobs: run: | python3 -m pip install meson ninja - - name: Compile + - name: Compile and Test run: | meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Ddefault_library=${{matrix.type}} -Dwarning_level=3 -Dcpp_std=c++20 meson compile -C "${{github.workspace}}/build" --verbose diff --git a/.github/workflows/on_PR_meson_clang.yaml b/.github/workflows/on_PR_meson_clang.yaml index 0edff554..c715a5bf 100644 --- a/.github/workflows/on_PR_meson_clang.yaml +++ b/.github/workflows/on_PR_meson_clang.yaml @@ -23,7 +23,7 @@ jobs: sudo apt install -y clang-${{matrix.cxx}} libc++abi-${{matrix.cxx}}-dev libc++-${{matrix.cxx}}-dev lld-${{matrix.cxx}} python3 -m pip install meson ninja - - name: Sanity Checks + - name: Compile and Test env: CXX: clang++-${{matrix.cxx}} CXXFLAGS: -stdlib=libc++