Skip to content

Commit 9f4e8cc

Browse files
committed
Try CI matrix
1 parent 5be542d commit 9f4e8cc

File tree

1 file changed

+13
-30
lines changed

1 file changed

+13
-30
lines changed

.github/workflows/test.yml

Lines changed: 13 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -96,37 +96,20 @@ jobs:
9696
run: |
9797
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
9898
bash -c "ci/scripts/build_example.sh $(pwd)/example"
99-
ubuntu-meson:
100-
name: Meson - AMD64 Ubuntu 24.04
101-
runs-on: ubuntu-24.04
102-
timeout-minutes: 30
103-
strategy:
104-
fail-fast: false
105-
steps:
106-
- uses: actions/setup-python@v5
107-
with:
108-
python-version: '3.x'
109-
- name: Checkout iceberg-cpp
110-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
111-
with:
112-
fetch-depth: 0
113-
- name: Install build dependencies
114-
run: |
115-
python3 -m pip install --upgrade pip
116-
python3 -m pip install meson ninja
117-
- name: Build Iceberg
118-
run: |
119-
meson setup builddir
120-
meson compile -C builddir
121-
- name: Test Iceberg
122-
run: |
123-
meson test -C builddir
124-
windows-meson:
125-
name: Meson - AMD64 Windows 2022
126-
runs-on: windows-2022
127-
timeout-minutes: 30
99+
meson:
100+
name: Meson - ${{ matrix.title }}
101+
runs-on: ${{ matrix.runs-on }}
128102
strategy:
129103
fail-fast: false
104+
matrix:
105+
include:
106+
- title: AMD64 Ubuntu 24.04
107+
runs-on: ubuntu-24.04
108+
- title: AMD64 Windows 2022
109+
runs-on: windows-2022
110+
meson-setup-args: --vsenv
111+
- title: AArch64 macOS 15
112+
runs-on: macos-15
130113
steps:
131114
- uses: actions/setup-python@v5
132115
with:
@@ -141,7 +124,7 @@ jobs:
141124
python3 -m pip install meson ninja
142125
- name: Build Iceberg
143126
run: |
144-
meson setup builddir --vsenv
127+
meson setup builddir ${{ matrix.meson-setup-args || '' }}
145128
meson compile -C builddir
146129
- name: Test Iceberg
147130
run: |

0 commit comments

Comments
 (0)