Skip to content

Commit cf9856a

Browse files
committed
tests: upgrade to meson 1.3.2
1 parent 5cacc60 commit cf9856a

File tree

320 files changed

+372
-352
lines changed

Some content is hidden

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

320 files changed

+372
-352
lines changed

.azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
displayName: System Information
2323
- script: sudo add-apt-repository 'ppa:ubuntu-toolchain-r/test' && sudo apt-get update && sudo apt-get install -y ninja-build ninja-build python3-pip python3-setuptools python3-wheel clang-14 clang-tools-14
2424
displayName: Install APT Dependencies
25-
- script: pip3 install -v meson==0.55.1
25+
- script: pip3 install -v meson==0.64.0
2626
displayName: Install pip Dependencies
2727
- script: scan-build-14 /home/vsts/.local/bin/meson setup build -Db_sanitize=address,undefined
2828
displayName: Configure
@@ -47,7 +47,7 @@ jobs:
4747
displayName: System Information
4848
- script: sudo add-apt-repository 'ppa:ubuntu-toolchain-r/test' && sudo apt-get update && sudo apt-get install -y ninja-build ninja-build python3-pip python3-setuptools python3-wheel gcc-10 g++-10
4949
displayName: Install APT Dependencies
50-
- script: pip3 install meson==0.55.1
50+
- script: pip3 install meson==0.64.0
5151
displayName: Install pip Dependencies
5252
- script: /home/vsts/.local/bin/meson setup build -Db_sanitize=address,undefined
5353
displayName: Configure
@@ -72,7 +72,7 @@ jobs:
7272
# displayName: System Information
7373
# - script: sudo dpkg --add-architecture mips64el && sudo apt-get update && sudo apt-get install -y ninja-build ninja-build python3-pip python3-setuptools python3-wheel libc6:mips64el gcc-10-mips64el-linux-gnuabi64 g++-10-mips64el-linux-gnuabi64 qemu-user-static
7474
# displayName: Install APT Dependencies
75-
# - script: pip3 install meson==0.55.1
75+
# - script: pip3 install meson==0.64.0
7676
# displayName: Install pip Dependencies
7777
# - script: /home/vsts/.local/bin/meson setup build --cross-file=docker/cross-files/loongson-gcc-10.cross
7878
# displayName: Configure

.circleci/config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
ccache --set-config=compression=true
2525
ccache -p
2626
ccache -z
27-
- run: pipx install meson==0.55.1
27+
- run: pipx install meson==1.3.2
2828
- run: ./test/native-aliases.sh
2929
- run: |
3030
export PATH=/usr/lib/ccache:${PATH}
@@ -64,7 +64,7 @@ jobs:
6464
ccache --set-config=compression=true
6565
ccache -p
6666
ccache -z
67-
- run: pipx install meson==0.55.1
67+
- run: pipx install meson==1.3.2
6868
- run: |
6969
export PATH=/usr/lib/ccache:${PATH}
7070
CC="ccache gcc" CXX="ccache g++" /root/.local/bin/meson setup build
@@ -103,7 +103,7 @@ jobs:
103103
ccache --set-config=compression=true
104104
ccache -p
105105
ccache -z
106-
- run: pipx install meson==0.55.1
106+
- run: pipx install meson==1.3.2
107107
- run: |
108108
export PATH=/usr/lib/ccache:${PATH}
109109
CC="ccache gcc" CXX="ccache g++" /root/.local/bin/meson setup build
@@ -140,7 +140,7 @@ jobs:
140140
ccache --set-config=compression=true
141141
ccache -p
142142
ccache -z
143-
- run: pipx install meson==0.55.1
143+
- run: pipx install meson==1.3.2
144144
- run: |
145145
export PATH=/usr/lib/ccache:${PATH}
146146
CFLAGS="-Wno-unsafe-buffer-usage" CXXFLAGS="-Wno-unsafe-buffer-usage" CC="ccache clang" CXX="ccache clang++" /root/.local/bin/meson setup build
@@ -171,7 +171,7 @@ jobs:
171171
name: System Information
172172
command: cat /proc/cpuinfo /proc/meminfo
173173
- run: dpkg --add-architecture i386
174-
- run: pipx install meson==0.55.1
174+
- run: pipx install meson==1.3.2
175175
- run:
176176
command: |
177177
ccache --set-config=max_size='500M'
@@ -208,7 +208,7 @@ jobs:
208208
name: System Information
209209
command: cat /proc/cpuinfo /proc/meminfo
210210
- run: dpkg --add-architecture i386
211-
- run: pipx install meson==0.55.1
211+
- run: pipx install meson==1.3.2
212212
- run:
213213
command: |
214214
ccache --set-config=max_size='500M'

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ task:
1515
install_dependencies_script:
1616
- apt-get update
1717
- apt-get install -y ninja-build ninja-build pipx python3-setuptools python3-wheel gcovr clang-17
18-
- pipx install meson==0.55.1
18+
- pipx install meson==0.64.0
1919
configure_script:
2020
- /root/.local/bin/meson setup build -Db_coverage=true -Db_sanitize=address,undefined -Db_lundef=false
2121
build_script:

.drone.star.disabled

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def main(ctx):
6666
"echo 'APT::Acquire::Retries \"3\";' > /etc/apt/apt.conf.d/80-retries",
6767
"apt-get update -y",
6868
"apt-get install -y " + " ".join(packages),
69-
"pip3 install meson==0.55.1",
69+
"pip3 install meson==1.3.2",
7070
"meson build -Db_coverage=true || (cat build/meson-logs/meson-log.txt; false)",
7171
"ninja -C build -v test || (cat build/meson-logs/testlog.txt; false)",
7272
],
@@ -102,7 +102,7 @@ def main(ctx):
102102
# "cat /proc/cpuinfo",
103103
# "apt-get update -y",
104104
# "apt-get install -y " + " ".join(['ninja-build', 'git-core', 'python3-pip', 'gcovr', 'clang', 'curl']),
105-
# "pip3 install meson==0.55.1",
105+
# "pip3 install meson==1.3.2",
106106
# "(cd test && sh -x ./native-aliases.sh)",
107107
# "meson build -Db_coverage=true",
108108
# "ninja -C build -v test",

.github/workflows/ci.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Install APT Dependencies
2525
run: |
2626
sudo apt-get update && sudo apt-get install -y --no-install-recommends ninja-build
27-
pipx install meson==0.55.1
27+
pipx install meson==1.3.2
2828
- run: |
2929
meson setup build --prefix "$PWD/install" -Dtests=false
3030
meson install -C build --quiet
@@ -141,7 +141,7 @@ jobs:
141141
sudo apt-get purge -y gcc g++
142142
sudo ln -s /usr/bin/gcc-15 /usr/bin/gcc
143143
sudo ln -s /usr/bin/g++-15 /usr/bin/g++
144-
pipx install meson==0.55.1
144+
pipx install meson==1.3.2
145145
- name: ccache
146146
uses: hendrikmuhs/[email protected]
147147
with:
@@ -186,7 +186,7 @@ jobs:
186186
sudo apt-get purge -y gcc g++
187187
sudo ln -s /usr/bin/gcc-15 /usr/bin/gcc
188188
sudo ln -s /usr/bin/g++-15 /usr/bin/g++
189-
pipx install meson==0.55.1
189+
pipx install meson==1.3.2
190190
- name: ccache
191191
uses: hendrikmuhs/[email protected]
192192
with:
@@ -220,7 +220,7 @@ jobs:
220220
run: |
221221
sudo add-apt-repository ppa:stephanosio/ccache
222222
sudo apt-get install -y --no-install-recommends ninja-build pipx ccache
223-
pipx install meson==0.55.1
223+
pipx install meson==1.3.2
224224
- name: ccache
225225
uses: hendrikmuhs/[email protected]
226226
with:
@@ -270,7 +270,7 @@ jobs:
270270
sudo apt-get purge -y gcc g++
271271
sudo ln -s /usr/bin/gcc-15 /usr/bin/gcc
272272
sudo ln -s /usr/bin/g++-15 /usr/bin/g++
273-
pipx install meson==0.55.1
273+
pipx install meson==1.3.2
274274
- name: ccache
275275
uses: hendrikmuhs/[email protected]
276276
with:
@@ -311,7 +311,7 @@ jobs:
311311
sudo apt-get purge -y gcc g++
312312
sudo ln -s /usr/bin/gcc-15 /usr/bin/gcc
313313
sudo ln -s /usr/bin/g++-15 /usr/bin/g++
314-
pipx install meson==0.55.1
314+
pipx install meson==1.3.2
315315
- name: ccache
316316
uses: hendrikmuhs/[email protected]
317317
with:
@@ -436,7 +436,7 @@ jobs:
436436
ccache gcc-${{ case(matrix.gcc == '', matrix.version, format('{0}-{1}', matrix.version, matrix.gcc)) }} \
437437
g++-${{ case(matrix.gcc == '', matrix.version, format('{0}-{1}', matrix.version, matrix.gcc)) }}
438438
sudo apt-get -y purge g++ gcc
439-
pipx install meson==0.64
439+
pipx install meson==1.3.2
440440
- if: ${{ matrix.version == '15' }}
441441
run: sudo apt-get satisfy -y 'binutils (>= 2.45)'
442442
- name: ccache
@@ -519,7 +519,7 @@ jobs:
519519
gcc-${{ matrix.version }}-${{ matrix.arch_gnu }}-linux-gnu${{ matrix.arch_gnu_abi }} \
520520
g++-${{ matrix.version }}-${{ matrix.arch_gnu }}-linux-gnu${{ matrix.arch_gnu_abi }} binfmt-support \
521521
qemu-user-static pipx libc6-${{ matrix.arch_deb }}-cross libstdc++-${{ matrix.version }}-dev-${{ matrix.arch_deb }}-cross
522-
pipx install meson==0.55.1
522+
pipx install meson==1.3.2
523523
- name: ccache
524524
uses: hendrikmuhs/[email protected]
525525
with:
@@ -747,6 +747,7 @@ jobs:
747747
- version: "14"
748748
distro: ubuntu-24.04-arm
749749
arch_flags: -march=armv8-a+fp+aes+sha2
750+
plain: true
750751
# grep Features < /proc/cpuinfo | head -n 1 | awk '-F: ' '{print $2}' | sed 's/asimd //;s/evtstrm //;s/pmull //;s/sha1 //;s/crc32 //;s/atomics //;s/fphp //;s/asimd.. //g;s/cpuid //;s/asimd... //g;s/jscvt //;s/fcma //;s/lrcpc //;s/dcpop //;s/sm3 //;s/sha512 //;s/uscat //;s/ilrcpc //;s/pac. //g;s/dcpodp //;s/sveaes //;s/svebitperm //;s/svesha3 //;s/svesm4 //;s/flagm2 //;s/frint //;s/svei8mm //;s/svebf16 //' | tr ' ' '+'
751752
- version: "14"
752753
distro: ubuntu-24.04-arm
@@ -908,7 +909,7 @@ jobs:
908909
sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa
909910
sudo apt-get -y --no-install-recommends install ninja-build pipx \
910911
clang-${{ matrix.version }} ccache ${{ matrix.pkg }}
911-
pipx install meson==0.55.1
912+
pipx install meson==1.3.2
912913
sudo rm /usr/bin/gcc /usr/bin/g++ /usr/bin/cc /usr/bin/c++
913914
sudo ln -s "$(command -v clang-${{ matrix.version }})" /usr/bin/cc
914915
sudo ln -s "$(command -v clang-${{ matrix.version }})" /usr/bin/c++
@@ -1007,7 +1008,7 @@ jobs:
10071008
- name: CPU Information
10081009
run: cat /proc/cpuinfo
10091010
- name: Install APT Dependencies
1010-
run: sudo apt-get install -y --no-install-recommends ninja-build pipx && pipx install meson==0.64
1011+
run: sudo apt-get install -y --no-install-recommends ninja-build pipx && pipx install meson==1.3.2
10111012
- name: Install ICC
10121013
run: |
10131014
# download the key to system keyring

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
- run: |
3838
sudo apt-get install -y ninja-build pipx gcc g++
39-
pip3 install meson==0.55.1
39+
pip3 install meson==1.3.2
4040
"$HOME/.local/bin/meson" setup build
4141
4242
- name: Perform CodeQL Analysis

.github/workflows/gcc-snapshot.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
sudo apt-get purge -y gcc g++
5959
sudo ln -s /usr/bin/gcc-16 /usr/bin/gcc
6060
sudo ln -s /usr/bin/g++-16 /usr/bin/g++
61-
pipx install meson==0.55.1
61+
pipx install meson==1.3.2
6262
# - name: ccache
6363
# uses: hendrikmuhs/[email protected]
6464
# with:
@@ -110,7 +110,7 @@ jobs:
110110
sudo apt-get purge -y gcc g++
111111
sudo ln -s /usr/bin/gcc-16 /usr/bin/gcc
112112
sudo ln -s /usr/bin/g++-16 /usr/bin/g++
113-
pipx install meson==0.55.1
113+
pipx install meson==1.3.2
114114
# - name: ccache
115115
# uses: hendrikmuhs/[email protected]
116116
# with:
@@ -157,7 +157,7 @@ jobs:
157157
sudo apt-get purge -y gcc g++
158158
sudo ln -s /usr/bin/gcc-16 /usr/bin/gcc
159159
sudo ln -s /usr/bin/g++-16 /usr/bin/g++
160-
pipx install meson==0.55.1
160+
pipx install meson==1.3.2
161161
# - name: ccache
162162
# uses: hendrikmuhs/[email protected]
163163
# with:
@@ -244,7 +244,7 @@ jobs:
244244
gcc-${{ case(matrix.gcc == '', '16', format('16-{0}', matrix.gcc)) }} \
245245
g++-${{ case(matrix.gcc == '', '16', format('16-{0}', matrix.gcc)) }}
246246
sudo apt-get -y purge g++ gcc
247-
pipx install meson==0.55.1
247+
pipx install meson==1.3.2
248248
# - name: ccache
249249
# uses: hendrikmuhs/[email protected]
250250
# with:
@@ -322,7 +322,7 @@ jobs:
322322
gcc-${{ matrix.version }}-${{ matrix.arch_gnu }}-linux-gnu$ \
323323
g++-${{ matrix.version }}-${{ matrix.arch_gnu }}-linux-gnu$ \
324324
libstdc++-${{ matrix.version }}-dev-${{ matrix.arch_deb }}-cross
325-
pipx install meson==0.55.1
325+
pipx install meson==1.3.2
326326
# - name: ccache
327327
# uses: hendrikmuhs/[email protected]
328328
# with:

.semaphore/semaphore.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ blocks:
2020
- git submodule update --init
2121
- sudo apt-get update
2222
- sudo apt-get install -y ninja-build python3-pip python3-setuptools gcovr gcc-${GCC_VERSION} g++-${GCC_VERSION}
23-
- pip3 install meson==0.55.1
23+
- pip3 install meson==1.3.2
2424
- mkdir build
2525
- CC="gcc-${GCC_VERSION}" CXX="g++-${GCC_VERSION}" ~/.local/bin/meson setup build -Db_coverage=true --optimization $(expr $RANDOM % 3)
2626
- ~/.local/bin/meson compile -C build --ninja-args=-v
@@ -42,7 +42,7 @@ blocks:
4242
- git submodule update --init
4343
- sudo apt-get update
4444
- sudo apt-get install -y ninja-build python3-pip python3-setuptools gcovr clang-${CLANG_VERSION}
45-
- pip3 install meson==0.55.1
45+
- pip3 install meson==1.3.2
4646
- mkdir build
4747
- CC="clang-${CLANG_VERSION}" CXX="clang++-${CLANG_VERSION}" ~/.local/bin/meson setup build -Db_coverage=true
4848
- ~/.local/bin/meson compile -C build --ninja-args=-v

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ before_install:
3737
- cat /proc/meminfo
3838

3939
install:
40-
- pip3 install meson==0.55.1
40+
- pip3 install meson==1.3.2
4141

4242
script:
4343
- meson setup build -Db_coverage=true

docker/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ RUN \
3737
npm libsleef-dev \
3838
pipx wget curl
3939

40-
# Meson on stable is too old, and we want to make sure we keep 0.55
41-
# working for a while.
42-
RUN pipx install meson==0.55.1
40+
RUN pipx install meson==1.3.2
4341

4442
# GCC cross-compilers
4543
RUN \

0 commit comments

Comments
 (0)