aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stapelberg <michael@stapelberg.de>2023-01-02 10:51:37 +0100
committerMichael Stapelberg <stapelberg@users.noreply.github.com>2023-01-02 11:36:37 +0100
commit90d7b9769c07d65b1d9a49bca42a5d6e3a7ac5cf (patch)
tree5566504930a170d0b7ad763bb3b7c5ae717f3c22
parent16f83396b4c52021483264cd6e5a6f54fedc75d4 (diff)
downloadi3-90d7b9769c07d65b1d9a49bca42a5d6e3a7ac5cf.tar.gz
i3-90d7b9769c07d65b1d9a49bca42a5d6e3a7ac5cf.zip
meson: specify check: false on run_command
We use run_command for conditionals, meaning meson execution should not stop when the command returns false. This change keeps our meson setup working throughout the upcoming change of default behavior (check: true).
-rw-r--r--meson.build8
1 files changed, 4 insertions, 4 deletions
diff --git a/meson.build b/meson.build
index b272c271..25080cea 100644
--- a/meson.build
+++ b/meson.build
@@ -13,10 +13,10 @@ project(
# TODO(https://github.com/i3/i3/issues/4087): switch to
# 'buildtype=debugoptimized',
],
- # Ubuntu 18.04 (supported until 2023) has meson 0.45.
+ # Ubuntu 20.04 (supported until 2025) has meson 0.53.
# We can revisit our minimum supported meson version
# if it turns out to be too hard to maintain.
- meson_version: '>=0.45.0',
+ meson_version: '>=0.47.0',
)
cc = meson.get_compiler('c')
@@ -125,7 +125,7 @@ if get_option('docs')
endforeach
else
- if run_command('[', '-f', 'docs/hacking-howto.html', ']').returncode() == 0
+ if run_command('[', '-f', 'docs/hacking-howto.html', ']', check: false).returncode() == 0
install_data(
[
'docs/hacking-howto.html',
@@ -269,7 +269,7 @@ if get_option('mans')
endforeach
else
- if run_command('[', '-f', 'man/i3.1', ']').returncode() == 0
+ if run_command('[', '-f', 'man/i3.1', ']', check: false).returncode() == 0
install_data(
[
'man/i3.1',