luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

ci: Drop some workarounds for old Meson versions

Browse Source 
Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2021-10-07 17:06:30 +01:00
parent 46588698e2
commit 4f3e7ca721
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.gitlab-ci.yml
View File

@ -68,7 +68,7 @@ fedora-x86_64:
CFLAGS: "-coverage -ftest-coverage -fprofile-arcs" CFLAGS: "-coverage -ftest-coverage -fprofile-arcs"
script: script:
# FIXME: Cannot use MESON_COMMON_OPTIONS here because meson warns about gtkdoc # 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. # with --fatal-meson-warnings.
- meson ${MESON_COMMON_OPTIONS_NO_WARNING} - meson ${MESON_COMMON_OPTIONS_NO_WARNING}
--werror --werror
@ -270,10 +270,7 @@ cross-android_api21_arm64:
# FIXME: add --werror # FIXME: add --werror
# We use -Diconv=auto to test that we successfully detect that iconv is not # 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. # 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 - meson ${MESON_COMMON_OPTIONS} --cross-file=/opt/cross_file_android_arm64_21.txt -Diconv=auto _build
# 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
- ninja -C _build - ninja -C _build
cross-android_api28_arm64: cross-android_api28_arm64:
@ -281,10 +278,7 @@ cross-android_api28_arm64:
image: $ANDROID_IMAGE image: $ANDROID_IMAGE
script: script:
# FIXME: add --werror # FIXME: add --werror
# FIXME: Work around a bug in Meson 0.49 where --wrap-mode=nodownload also - meson ${MESON_COMMON_OPTIONS} --cross-file=/opt/cross_file_android_arm64_28.txt _build
# 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
- ninja -C _build - ninja -C _build
cross-mingw64: cross-mingw64:
@ -292,10 +286,7 @@ cross-mingw64:
image: $MINGW_IMAGE image: $MINGW_IMAGE
script: script:
# FIXME: Add --werror # FIXME: Add --werror
# FIXME: Work around a bug in Meson 0.49 where --wrap-mode=nodownload also - meson ${MESON_COMMON_OPTIONS} --cross-file=/opt/cross_file_mingw64.txt _build
# 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
- ninja -C _build - ninja -C _build
artifacts: artifacts:
reports: reports:
@ -556,8 +547,9 @@ dist-job:
only: only:
- tags - tags
script: script:
# FIXME: Cannot use --fatal-meson-warnings here because meson warns about gtkdoc # FIXME: Cannot use MESON_COMMON_OPTIONS here because meson warns about gtkdoc
# feature introduced in 0.52 but we only depends on 0.49. # 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 - meson ${MESON_COMMON_OPTIONS_NO_WARNING} --buildtype release -Dgtk_doc=true -Dman=true _build
- cd _build - cd _build
- ninja dist - ninja dist