meson CI: build for 32-bit Windows too
Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
parent
9378aa9fa1
commit
c5a5375527
12
.github/workflows/on_PR_meson.yaml
vendored
12
.github/workflows/on_PR_meson.yaml
vendored
@ -23,7 +23,7 @@ jobs:
|
|||||||
sudo apt install -y g++-${{matrix.cxx}}
|
sudo apt install -y g++-${{matrix.cxx}}
|
||||||
python3 -m pip install meson ninja
|
python3 -m pip install meson ninja
|
||||||
|
|
||||||
- name: Sanity Checks
|
- name: Compile and Test
|
||||||
env:
|
env:
|
||||||
CXX: g++-${{matrix.cxx}}
|
CXX: g++-${{matrix.cxx}}
|
||||||
run: |
|
run: |
|
||||||
@ -33,10 +33,11 @@ jobs:
|
|||||||
|
|
||||||
VisualStudio:
|
VisualStudio:
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
name: MSVC-${{matrix.deps}}-${{matrix.type}}
|
name: MSVC-${{matrix.deps}}-${{matrix.type}}-${{matrix.platform}}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
deps: ['forcefallback', 'default']
|
deps: ['forcefallback', 'default']
|
||||||
|
platform: ['x64', 'x86']
|
||||||
type: ['shared', 'static']
|
type: ['shared', 'static']
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
@ -46,7 +47,10 @@ jobs:
|
|||||||
python -m pip install meson ninja
|
python -m pip install meson ninja
|
||||||
|
|
||||||
- uses: ilammy/msvc-dev-cmd@v1
|
- uses: ilammy/msvc-dev-cmd@v1
|
||||||
- name: Sanity Checks
|
with:
|
||||||
|
arch: ${{matrix.platform}}
|
||||||
|
|
||||||
|
- name: Compile and Test
|
||||||
run: |
|
run: |
|
||||||
meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Ddefault_library=${{matrix.type}} -Dwarning_level=3 -Dcpp_std=c++20
|
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
|
meson compile -C "${{github.workspace}}/build" --verbose
|
||||||
@ -66,7 +70,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
python3 -m pip install meson ninja
|
python3 -m pip install meson ninja
|
||||||
|
|
||||||
- name: Compile
|
- name: Compile and Test
|
||||||
run: |
|
run: |
|
||||||
meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Ddefault_library=${{matrix.type}} -Dwarning_level=3 -Dcpp_std=c++20
|
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
|
meson compile -C "${{github.workspace}}/build" --verbose
|
||||||
|
|||||||
2
.github/workflows/on_PR_meson_clang.yaml
vendored
2
.github/workflows/on_PR_meson_clang.yaml
vendored
@ -23,7 +23,7 @@ jobs:
|
|||||||
sudo apt install -y clang-${{matrix.cxx}} libc++abi-${{matrix.cxx}}-dev libc++-${{matrix.cxx}}-dev lld-${{matrix.cxx}}
|
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
|
python3 -m pip install meson ninja
|
||||||
|
|
||||||
- name: Sanity Checks
|
- name: Compile and Test
|
||||||
env:
|
env:
|
||||||
CXX: clang++-${{matrix.cxx}}
|
CXX: clang++-${{matrix.cxx}}
|
||||||
CXXFLAGS: -stdlib=libc++
|
CXXFLAGS: -stdlib=libc++
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user