diff options
| author |  Kenny Levinsen <kl@kl.wtf> | 2022-01-11 11:35:44 +0100 |
|---|---|---|
| committer |  Simon Ser <contact@emersion.fr> | 2022-01-16 19:26:57 +0100 |
| commit | 02a69dde9f1f3a7bd1435effabf5fef9f78d8649 (patch) | |
| tree | 1c3d41d7586aeff23ed0238906064f29f5ad95e9 | |
| parent | Add safety assert in parse_movement_unit (diff) | |
| download | sway-02a69dde9f1f3a7bd1435effabf5fef9f78d8649.tar.gz sway-02a69dde9f1f3a7bd1435effabf5fef9f78d8649.tar.zst sway-02a69dde9f1f3a7bd1435effabf5fef9f78d8649.zip | |
meson: check: false on run_command
Future meson releases will change the default and warns when the
implicit default is used, breaking builds.
Explicitly set check: false to maintain behavior and silence warnings.
(cherry picked from commit 470e04e8da6e078da77190998b5e0c34e244839a)
| -rw-r--r-- | meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build index e02cd259..20452b3f 100644 --- a/meson.build +++ b/meson.build | |||
| @@ -156,8 +156,8 @@ add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir | |||
| 156 | version = '"@0@"'.format(meson.project_version()) | 156 | version = '"@0@"'.format(meson.project_version()) |
| 157 | git = find_program('git', native: true, required: false) | 157 | git = find_program('git', native: true, required: false) |
| 158 | if git.found() | 158 | if git.found() |
| 159 | git_commit = run_command([git, 'rev-parse', '--short', 'HEAD']) | 159 | git_commit = run_command([git, 'rev-parse', '--short', 'HEAD'], check: false) |
| 160 | git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD']) | 160 | git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD'], check: false) |
| 161 | if git_commit.returncode() == 0 and git_branch.returncode() == 0 | 161 | if git_commit.returncode() == 0 and git_branch.returncode() == 0 |
| 162 | version = '"@0@-@1@ (" __DATE__ ", branch \'@2@\')"'.format( | 162 | version = '"@0@-@1@ (" __DATE__ ", branch \'@2@\')"'.format( |
| 163 | meson.project_version(), | 163 | meson.project_version(), |