From cd2d460d4b6dbb291a4bd1b99e87a9cb69805203 Mon Sep 17 00:00:00 2001 From: Andrei Alexeyev Date: Wed, 14 Dec 2022 01:45:17 +0100 Subject: [PATCH] build: Require meson >=0.63.0 --- .github/workflows/emscripten-experimental.yml | 2 +- .github/workflows/main.yml | 2 +- .github/workflows/release.yml | 2 +- doc/BUILD.rst | 2 +- meson.build | 2 +- misc/ci/Dockerfile.linux | 2 +- misc/ci/Dockerfile.switch | 2 +- misc/ci/Dockerfile.windows | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/emscripten-experimental.yml b/.github/workflows/emscripten-experimental.yml index 7720000b9f..ea84b90e34 100644 --- a/.github/workflows/emscripten-experimental.yml +++ b/.github/workflows/emscripten-experimental.yml @@ -11,7 +11,7 @@ on: - cron: '0 10 * * 4' env: - MESON_VERSION: '0.56.2' + MESON_VERSION: '0.63.0' EM_VERSION: 'tot' EM_CACHE_FOLDER: 'emsdk' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 235ca883b4..66670edf5b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ on: - "**.wrap" env: - MESON_VERSION: '0.56.2' + MESON_VERSION: '0.63.0' EM_VERSION: '3.1.5' EM_CACHE_FOLDER: 'emsdk' TAISEI_NOPRELOAD: 0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b5c0c65448..4c547e1155 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ on: description: "Input git-ref to build as a test release" env: - MESON_VERSION: '0.56.2' + MESON_VERSION: '0.63.0' EM_VERSION: '2.0.29' EM_CACHE_FOLDER: 'emsdk' TAISEI_NOPRELOAD: 0 diff --git a/doc/BUILD.rst b/doc/BUILD.rst index 7c712146ad..e46783727a 100644 --- a/doc/BUILD.rst +++ b/doc/BUILD.rst @@ -33,7 +33,7 @@ Build-Time Dependenices """"""""""""""""""""""" - ``gcc`` or ``clang`` -- meson >= 0.56.2 +- meson >= 0.63.0 - Python >= 3.6 - `python-zstandard `__ >= 0.11.1 - `python-docutils `__ (optional, for generating documentation) diff --git a/meson.build b/meson.build index 8753e1209d..0c105fde67 100644 --- a/meson.build +++ b/meson.build @@ -5,7 +5,7 @@ project('taisei', 'c', files('scripts/version.py'), '--rootdir', meson.project_source_root(), ], check : true).stdout().strip(), - meson_version : '>=0.56.2', + meson_version : '>=0.63.0', default_options : [ 'c_std=gnu11', diff --git a/misc/ci/Dockerfile.linux b/misc/ci/Dockerfile.linux index 06a0d4194c..b6ab2507f0 100644 --- a/misc/ci/Dockerfile.linux +++ b/misc/ci/Dockerfile.linux @@ -23,6 +23,6 @@ RUN apt update && \ git RUN pip3 install \ - meson==0.56.2 \ + meson==0.63.0 \ ninja \ zstandard diff --git a/misc/ci/Dockerfile.switch b/misc/ci/Dockerfile.switch index f46f0e8ef7..4eb268f869 100644 --- a/misc/ci/Dockerfile.switch +++ b/misc/ci/Dockerfile.switch @@ -28,7 +28,7 @@ RUN apt-get update && \ rm -rf /var/lib/apt/lists/* RUN pip3 install \ - meson==0.56.2 \ + meson==0.63.0 \ ninja \ zstandard \ python-gnupg diff --git a/misc/ci/Dockerfile.windows b/misc/ci/Dockerfile.windows index 886ba070c1..125f272832 100644 --- a/misc/ci/Dockerfile.windows +++ b/misc/ci/Dockerfile.windows @@ -20,7 +20,7 @@ RUN apt-get update -qq && \ rm -rf /var/lib/apt/lists/* RUN pip3 install \ - meson==0.56.2 \ + meson==0.63.0 \ ninja \ zstandard \ python-gnupg