Skip to content

Commit 5d5a3d4

Browse files
rgommersrgommers
authored
Merge pull request #24 from rgommers/update-to-1.9.2
Update to meson 1.9.2
2 parents e72c717 + cf49949 commit 5d5a3d4

392 files changed

Lines changed: 8016 additions & 4021 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/file_format.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ jobs:
1818
with:
1919
python-version: '3.x'
2020
- run: python3 ./run_format_tests.py
21+
- run: python3 ./run_shell_checks.py

‎.github/workflows/images.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,14 @@ jobs:
3737
fail-fast: false
3838
matrix:
3939
cfg:
40-
- { name: Arch Linux, id: arch }
41-
- { name: CUDA (on Arch), id: cuda }
42-
- { name: Fedora, id: fedora }
43-
- { name: Gentoo, id: gentoo }
44-
- { name: OpenSUSE, id: opensuse }
45-
- { name: Ubuntu Bionic, id: bionic }
46-
- { name: Ubuntu Rolling, id: ubuntu-rolling }
40+
- { name: Arch Linux, id: arch }
41+
- { name: CUDA (on Arch), id: cuda }
42+
- { name: CUDA Cross (on Ubuntu Jammy), id: cuda-cross }
43+
- { name: Fedora, id: fedora }
44+
- { name: Gentoo, id: gentoo }
45+
- { name: OpenSUSE, id: opensuse }
46+
- { name: Ubuntu Bionic, id: bionic }
47+
- { name: Ubuntu Rolling, id: ubuntu-rolling }
4748
steps:
4849
# Need v3 because of bionic
4950
- uses: actions/checkout@v3

‎.github/workflows/lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/checkout@v4
3232
- uses: actions/setup-python@v5
3333
with:
34-
python-version: '3.x'
34+
python-version: '3.13'
3535
- run: python -m pip install pylint
3636
- run: pylint --output-format colorized mesonbuild
3737

@@ -53,7 +53,7 @@ jobs:
5353
with:
5454
python-version: '3.x'
5555
# Pin mypy to version 1.8, so we retain the ability to lint for Python 3.7
56-
- run: python -m pip install "mypy==1.8" strictyaml types-PyYAML types-tqdm types-chevron
56+
- run: python -m pip install "mypy==1.8" strictyaml truststore types-PyYAML types-tqdm types-chevron
5757
- run: python run_mypy.py --allver
5858
env:
5959
PYTHONUNBUFFERED: 1

‎.github/workflows/nonnative.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,13 @@ jobs:
3939
- uses: actions/checkout@v4
4040
- name: Run tests
4141
run: bash -c 'source /ci/env_vars.sh; cd $GITHUB_WORKSPACE; ./run_tests.py $CI_ARGS --cross ubuntu-armhf.json --cross-only'
42+
43+
cross-cuda:
44+
runs-on: ubuntu-latest
45+
container: mesonbuild/cuda-cross:latest
46+
env:
47+
MESON_CI_JOBNAME: cuda-cross-${{ github.job }}
48+
steps:
49+
- uses: actions/checkout@v4
50+
- name: Run tests
51+
run: bash -c 'source /ci/env_vars.sh; cd $GITHUB_WORKSPACE; ./run_tests.py $CI_ARGS --cross cuda-cross.json --cross-only'

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ __pycache__
2222
*~
2323
*.swp
2424
packagecache
25+
.wraplock
2526
/MANIFEST
2627
/build
2728
/dist

‎.mailmap‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
Alexandre Foley <Alexandre.foley@usherbrooke.ca> AlexandreFoley <alexandre.foley@usherbrooke.ca>
22
Igor Gnatenko <i.gnatenko.brain@gmail.com> Igor Gnatenko <ignatenko@redhat.com>
3-
Jussi Pakkanen <jpakkane@gmail.com> Jussi Pakkanen <jpakkane@brash.local>
4-
Jussi Pakkanen <jpakkane@gmail.com> jpakkane <jpakkane@gmail.com>
3+
Jussi Pakkanen <jussi.pakkanen@mailbox.org> Jussi Pakkanen <jpakkane@brash.local>
4+
Jussi Pakkanen <jussi.pakkanen@mailbox.org> Jussi Pakkanen <jpakkane@gmail.com>
5+
Jussi Pakkanen <jussi.pakkanen@mailbox.org> jpakkane <jpakkane@gmail.com>
56
Liam Beguin <liambeguin@gmail.com> Liam Beguin <lvb@xiphos.com>
67
Nirbheek Chauhan <nirbheek@centricular.com> Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
78
Nicolas Schneider <nioncode+git@gmail.com> Nicolas Schneider <nioncode+github@gmail.com>

‎azure-pipelines.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,28 +54,28 @@ variables:
5454

5555
jobs:
5656

57-
- job: vs2019
57+
- job: vs2022
5858
timeoutInMinutes: 120
5959
pool:
60-
vmImage: windows-2019
60+
vmImage: windows-2022
6161

6262
strategy:
6363
matrix:
64-
vc2019x64ninja:
64+
vc2022x64ninja:
6565
arch: x64
66-
compiler: msvc2019
66+
compiler: msvc2022
6767
backend: ninja
6868
ifort: true
69-
vc2019x64vs:
69+
vc2022x64vs:
7070
arch: x64
71-
compiler: msvc2019
72-
backend: vs2019
71+
compiler: msvc2022
72+
backend: vs2022
7373
# mysteriously, several tests fail because vs cannot find
7474
# executables such as cmd.exe ???
7575
ifort: false
76-
vc2019arm64ninjacross:
76+
vc2022arm64ninjacross:
7777
arch: arm64
78-
compiler: msvc2019
78+
compiler: msvc2022
7979
backend: ninja
8080
extraargs: --cross arm64cl.txt --cross-only
8181
# ifort doesn't support arm64
@@ -105,7 +105,7 @@ jobs:
105105
displayName: insert ifort into environment
106106
inputs:
107107
filename: ci/intel-scripts/activate_windows.bat
108-
arguments: vs2019
108+
arguments: vs2022
109109
modifyEnvironment: True
110110
condition: eq(variables.ifort, 'true')
111111
- task: PowerShell@2

‎ci/ciimage/arch/install.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ pkgs=(
1212
libelf gcc gcc-fortran gcc-objc vala rust bison flex cython go dlang-dmd
1313
mono boost qt5-base gtkmm3 gtest gmock protobuf gobject-introspection
1414
itstool glib2-devel gtk3 java-environment=8 gtk-doc llvm clang sdl2 graphviz
15-
doxygen vulkan-headers vulkan-icd-loader vulkan-validation-layers openssh mercurial gtk-sharp-2 qt5-tools
15+
doxygen vulkan-headers vulkan-icd-loader vulkan-validation-layers openssh mercurial gtk-sharp-3 qt5-tools
1616
libwmf cmake netcdf-fortran openmpi nasm gnustep-base gettext
1717
python-lxml hotdoc rust-bindgen qt6-base qt6-tools qt6-declarative wayland wayland-protocols
18+
intel-oneapi-mkl
1819
# cuda
1920
)
2021

‎ci/ciimage/cuda-cross/image.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"base_image": "ubuntu:22.04",
3+
"args": ["--only", "cuda", "--cross", "cuda-cross.json"],
4+
"env": {
5+
"CI": "1",
6+
"MESON_CI_JOBNAME": "linux-cuda-cross"
7+
}
8+
}

‎ci/ciimage/cuda-cross/install.sh‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
source /ci/common.sh
6+
7+
export DEBIAN_FRONTEND=noninteractive
8+
export LANG='C.UTF-8'
9+
10+
apt-get -y update
11+
apt-get -y upgrade
12+
apt-get -y install wget
13+
14+
# Cuda repo + keyring.
15+
wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.1-1_all.deb
16+
apt-get -y install ./cuda-keyring_1.1-1_all.deb
17+
18+
# Cuda cross repo.
19+
echo "deb [signed-by=/usr/share/keyrings/cuda-archive-keyring.gpg] https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/cross-linux-aarch64/ /" \
20+
> /etc/apt/sources.list.d/cuda-ubuntu2204-cross-linux-aarch64.list
21+
apt-get -y update
22+
23+
pkgs=(
24+
clang cmake crossbuild-essential-arm64 cuda-cross-aarch64
25+
cuda-nvcc-12-9 git libglib2.0-dev ninja-build pkg-config python3-pip
26+
)
27+
28+
apt-get -y install "${pkgs[@]}"
29+
30+
install_minimal_python_packages
31+
32+
# Tests need nvcc in PATH in order to run cuda tests.
33+
echo "export PATH=\$PATH:/usr/local/cuda/bin" >> /ci/env_vars.sh
34+
35+
# cleanup
36+
apt-get -y clean
37+
apt-get -y autoclean
38+
rm cuda-keyring_1.1-1_all.deb

0 commit comments

Comments
 (0)