From 4f3e7ca721125228f1f82843422605c334638a08 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 7 Oct 2021 17:06:30 +0100 Subject: [PATCH] ci: Drop some workarounds for old Meson versions Signed-off-by: Philip Withnall --- .gitlab-ci.yml | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6abbc461d..68f6906b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,7 +68,7 @@ fedora-x86_64: CFLAGS: "-coverage -ftest-coverage -fprofile-arcs" script: # FIXME: Cannot use MESON_COMMON_OPTIONS here because meson warns about gtkdoc - # feature introduced in 0.52 but we only depends on 0.49. So we cannot build + # feature fully functional in 0.54, but we only depend on 0.52. So we cannot build # with --fatal-meson-warnings. - meson ${MESON_COMMON_OPTIONS_NO_WARNING} --werror @@ -270,10 +270,7 @@ cross-android_api21_arm64: # FIXME: add --werror # We use -Diconv=auto to test that we successfully detect that iconv is not # provided by android api 21, and detect the external iconv instead. - # FIXME: Work around a bug in Meson 0.49 where --wrap-mode=nodownload also - # disables fallback subprojects, by passing --wrap-mode=default. Fixed in - # Meson commit 47b9c1a564756ac48a55da9a7c4d91787399c645 - - meson ${MESON_COMMON_OPTIONS} --cross-file=/opt/cross_file_android_arm64_21.txt -Diconv=auto --wrap-mode=default _build + - meson ${MESON_COMMON_OPTIONS} --cross-file=/opt/cross_file_android_arm64_21.txt -Diconv=auto _build - ninja -C _build cross-android_api28_arm64: @@ -281,10 +278,7 @@ cross-android_api28_arm64: image: $ANDROID_IMAGE script: # FIXME: add --werror - # FIXME: Work around a bug in Meson 0.49 where --wrap-mode=nodownload also - # disables fallback subprojects, by passing --wrap-mode=default. Fixed in - # Meson commit 47b9c1a564756ac48a55da9a7c4d91787399c645 - - meson ${MESON_COMMON_OPTIONS} --cross-file=/opt/cross_file_android_arm64_28.txt --wrap-mode=default _build + - meson ${MESON_COMMON_OPTIONS} --cross-file=/opt/cross_file_android_arm64_28.txt _build - ninja -C _build cross-mingw64: @@ -292,10 +286,7 @@ cross-mingw64: image: $MINGW_IMAGE script: # FIXME: Add --werror - # FIXME: Work around a bug in Meson 0.49 where --wrap-mode=nodownload also - # disables fallback subprojects, by passing --wrap-mode=default. Fixed in - # Meson commit 47b9c1a564756ac48a55da9a7c4d91787399c645 - - meson ${MESON_COMMON_OPTIONS} --cross-file=/opt/cross_file_mingw64.txt --wrap-mode=default _build + - meson ${MESON_COMMON_OPTIONS} --cross-file=/opt/cross_file_mingw64.txt _build - ninja -C _build artifacts: reports: @@ -556,8 +547,9 @@ dist-job: only: - tags script: - # FIXME: Cannot use --fatal-meson-warnings here because meson warns about gtkdoc - # feature introduced in 0.52 but we only depends on 0.49. + # FIXME: Cannot use MESON_COMMON_OPTIONS here because meson warns about gtkdoc + # feature fully functional in 0.54, but we only depend on 0.52. So we cannot build + # with --fatal-meson-warnings. - meson ${MESON_COMMON_OPTIONS_NO_WARNING} --buildtype release -Dgtk_doc=true -Dman=true _build - cd _build - ninja dist