From 36aca7acea6eb72b91eeb7c6816574c515a81676 Mon Sep 17 00:00:00 2001 From: Colin Clark Date: Sat, 7 Oct 2023 12:28:31 +0100 Subject: [PATCH] Configuration fix: Revise meson version Meson 1.0.0 is required for arm AppImage generation --- .github/workflows/check-build-actions.yml | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-build-actions.yml b/.github/workflows/check-build-actions.yml index b3c4c281..cc524bc8 100644 --- a/.github/workflows/check-build-actions.yml +++ b/.github/workflows/check-build-actions.yml @@ -17,7 +17,7 @@ jobs: directory: build setup-options: -Darchive=disabled -Dcms=disabled -Ddevel=disabled -Ddoxygen=disabled -Ddjvu=disabled -Devince=disabled -Dexecinfo=disabled -Dexiv2=disabled -Dgit=disabled -Dgps-map=disabled -Dheif=disabled -Dj2k=disabled -Djpeg=disabled -Djpegxl=disabled -Dlibraw=disabled -Dlua=disabled -Dpandoc=disabled -Dpdf=disabled -Dspell=disabled -Dtiff=disabled -Dvideothumbnailer=disabled -Dyelp-build=disabled options: --verbose - meson-version: 0.56.2 + meson-version: 1.0.0 - name: Upload logs uses: actions/upload-artifact@v2 if: always() diff --git a/meson.build b/meson.build index a66dc23a..ec1f3425 100644 --- a/meson.build +++ b/meson.build @@ -44,7 +44,7 @@ project( 'cpp', version : run_command('./version.sh', check : true).stdout().strip(), license : ['GPL-2.0-or-later'], - meson_version : '>=1.0.1', + meson_version : '>=1.0.0', default_options : ['cpp_std=c++14', 'warning_level=3', 'buildtype=debugoptimized', 'cpp_link_args=-rdynamic'] ) -- 2.20.1