meson CI: build for 32-bit Windows too

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2023-02-19 17:58:26 -08:00
parent 9378aa9fa1
commit c5a5375527
2 changed files with 9 additions and 5 deletions

View File

@ -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

View File

@ -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++