Skip to content

Commit 786cc9a

Browse files
update pipline
1 parent 254cf58 commit 786cc9a

File tree

2 files changed

+19
-24
lines changed

2 files changed

+19
-24
lines changed

.github/workflows/meson_ci.yml

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,26 @@ name: Meson CI
33
on:
44
push:
55
paths:
6-
- "**.c"
6+
- "**.cpp"
77
- "**.h"
88
- "**.py"
99
- "**.build"
1010
- "**.options"
1111
pull_request:
1212
paths:
13-
- "**.c"
13+
- "**.cpp"
1414
- "**.h"
1515
- "**.py"
1616
- "**.build"
1717
- "**.options"
1818

1919
jobs:
2020
build_msvc:
21-
name: Building on MSVC ${{ matrix.msvc_version }} with Meson v${{ matrix.meson_version }}
21+
name: Building on MSVC ${{ matrix.msvc_version }}
2222
runs-on: windows-latest
2323
strategy:
2424
matrix:
2525
msvc_version: [2015, 2017, 2019, 2022]
26-
meson_version: ["1.2.0", "1.3.0", "1.4.0"]
2726
steps:
2827
- name: Checkout code
2928
uses: actions/checkout@v4
@@ -39,7 +38,7 @@ jobs:
3938
shell: pwsh
4039
run: |
4140
python -m pip install --upgrade pip
42-
python -m pip install meson==${{ matrix.meson_version }} ninja
41+
python -m pip install meson ninja
4342
if ($env:msvc_version -eq "2015") {
4443
choco install visualstudio2015buildtools --package-parameters "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --includeRecommended --includeOptional --passive"
4544
} elseif ($env:msvc_version -eq "2017") {
@@ -53,7 +52,7 @@ jobs:
5352
$env:CXX="cl.exe"
5453
5554
- name: Configure
56-
run: meson setup builddir_msvc_${{ matrix.msvc_version }} --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3
55+
run: meson setup builddir_msvc_${{ matrix.msvc_version }} --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=everything
5756

5857
- name: Compile
5958
run: meson compile -C builddir_msvc_${{ matrix.msvc_version }}
@@ -69,12 +68,11 @@ jobs:
6968
path: builddir_msvc_${{ matrix.msvc_version }}/meson-logs/testlog.txt
7069

7170
build_macosx:
72-
name: Building on macOS with Xcode ${{ matrix.xcode_version }} and Meson v${{ matrix.meson_version }}
71+
name: Building on macOS with Xcode ${{ matrix.xcode_version }}
7372
runs-on: macos-latest
7473
strategy:
7574
matrix:
76-
xcode_version: ["15.0", "15.1", "15.2", "15.3", "15.4"]
77-
meson_version: ["1.2.0", "1.3.0", "1.4.0"]
75+
xcode_version: ["15.2", "15.3"]
7876
steps:
7977
- name: Checkout code
8078
uses: actions/checkout@v4
@@ -91,10 +89,10 @@ jobs:
9189

9290
- name: Install Meson and Ninja
9391
run: |
94-
python -m pip install meson==${{ matrix.meson_version }} ninja
92+
python -m pip install meson ninja
9593
9694
- name: Configure
97-
run: meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3
95+
run: meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=everything
9896

9997
- name: Compile
10098
run: meson compile -C builddir
@@ -110,12 +108,11 @@ jobs:
110108
path: builddir/meson-logs/testlog.txt
111109

112110
build_msys:
113-
name: Building on MSYS with Meson v${{ matrix.meson_version }}
111+
name: Building on MSYS ${{ matrix.architecture }}
114112
runs-on: windows-latest
115113
strategy:
116114
matrix:
117115
architecture: [x86, x64]
118-
meson_version: ["1.2.0", "1.3.0", "1.4.0"]
119116
steps:
120117
- name: Checkout code
121118
uses: actions/checkout@v4
@@ -139,10 +136,10 @@ jobs:
139136

140137
- name: Install Meson and Ninja
141138
run: |
142-
python -m pip install meson==${{ matrix.meson_version }} ninja
139+
python -m pip install meson ninja
143140
144141
- name: Configure
145-
run: meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3
142+
run: meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=everything
146143

147144
- name: Compile
148145
run: meson compile -C builddir
@@ -158,12 +155,11 @@ jobs:
158155
path: builddir/meson-logs/testlog.txt
159156

160157
build_mingw:
161-
name: Building on MinGW with Meson v${{ matrix.meson_version }}
158+
name: Building on MinGW ${{ matrix.architecture }}
162159
runs-on: windows-latest
163160
strategy:
164161
matrix:
165162
architecture: [x86, x64]
166-
meson_version: ["1.2.0", "1.3.0", "1.4.0"]
167163
steps:
168164
- name: Checkout code
169165
uses: actions/checkout@v4
@@ -191,10 +187,10 @@ jobs:
191187

192188
- name: Install Meson and Ninja
193189
run: |
194-
python -m pip install meson==${{ matrix.meson_version }} ninja
190+
python -m pip install meson ninja
195191
196192
- name: Configure
197-
run: meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3
193+
run: meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=everything
198194

199195
- name: Compile
200196
run: meson compile -C builddir
@@ -247,7 +243,7 @@ jobs:
247243
-w /workspace \
248244
${GITHUB_REPOSITORY}:${{ matrix.distro }} \
249245
/bin/bash -c "
250-
meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3 -Dc_std=c17
246+
meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=everything -Dc_std=c17
251247
meson compile -C builddir
252248
meson test -C builddir -v"
253249
@@ -339,8 +335,8 @@ jobs:
339335
340336
- name: Configure the Project
341337
run: |
342-
meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3 --cross-file $CROSS_FILE
338+
meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=everything --cross-file $CROSS_FILE
343339
344340
- name: Build the Project
345341
run: |
346-
meson compile -C builddir
342+
meson compile -C builddir

code/source/meson.build

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
subdir('unittest')
32
subdir('mockup')
4-
subdir('benchmark')
3+
subdir('benchmark')

0 commit comments

Comments
 (0)