Skip to content

Commit de7ed09

Browse files
committed
Updated CI matrix, fixed license files
1 parent b3d0094 commit de7ed09

File tree

3 files changed

+18
-28
lines changed

3 files changed

+18
-28
lines changed

.github/workflows/build_and_test.yml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,13 +250,27 @@ jobs:
250250
251251
meson:
252252
name: "Meson C++ configuration"
253-
runs-on: ubuntu-latest
253+
runs-on: ${{ matrix.os }}
254+
strategy:
255+
fail-fast: false
256+
matrix:
257+
os:
258+
- ubuntu-22.04
259+
- ubuntu-24.04
260+
- ubuntu-24.04-arm
261+
- macos-13
262+
- macos-14
263+
- macos-15
254264
steps:
255265
- name: Checkout
256266
uses: actions/checkout@v4
257-
- name: Install meson
258-
run: |
259-
sudo apt-get update && sudo apt-get install -y meson
267+
- uses: actions/setup-python@v5
268+
with:
269+
python-version: '3.x'
270+
- name: Install gcovr
271+
run: |
272+
pip install --upgrade pip
273+
pip install meson
260274
- name: "Test"
261275
run: |
262276
meson setup builddir

tools/meson.build

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,6 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
# Licensed under the Apache License, Version 2.0 (the "License");
19-
# you may not use this file except in compliance with the License.
20-
# You may obtain a copy of the License at
21-
#
22-
# http://www.apache.org/licenses/LICENSE-2.0
23-
#
24-
# Unless required by applicable law or agreed to in writing, software
25-
# distributed under the License is distributed on an "AS IS" BASIS,
26-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
27-
# See the License for the specific language governing permissions and
28-
# limitations under the License.
29-
3018
subdir('src')
3119

3220
if get_option('tests').enabled()

tools/src/meson.build

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,6 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
# Licensed under the Apache License, Version 2.0 (the "License");
19-
# you may not use this file except in compliance with the License.
20-
# You may obtain a copy of the License at
21-
#
22-
# http://www.apache.org/licenses/LICENSE-2.0
23-
#
24-
# Unless required by applicable law or agreed to in writing, software
25-
# distributed under the License is distributed on an "AS IS" BASIS,
26-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
27-
# See the License for the specific language governing permissions and
28-
# limitations under the License.
29-
3018
tools_incdir = include_directories(
3119
'../../c++/include',
3220
'../../c++/src',

0 commit comments

Comments
 (0)