From 547ef6e0600b703dcd42a10622563d7b91434669 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 24 Jul 2021 00:19:07 -0400 Subject: Build with C11 on CI Since this is not the default (because that would break the default build for some older systems), distributions and users are likely covering the C99 case heavily, so this is the best way to ensure that both are covered well. --- .gitlab-ci.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a745c08..50c8944d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,14 +12,14 @@ arm32_dbg: <<: *build_definition image: lv2plugin/debian-arm32 script: - - meson setup build --cross-file=/usr/share/meson/cross/arm-linux-gnueabihf.ini -Dbuildtype=debug -Ddocs=disabled -Dstrict=true -Dwerror=true + - meson setup build --cross-file=/usr/share/meson/cross/arm-linux-gnueabihf.ini -Dc_std=c11 -Dbuildtype=debug -Ddocs=disabled -Dstrict=true -Dwerror=true - ninja -C build test arm32_rel: <<: *build_definition image: lv2plugin/debian-arm32 script: - - meson setup build --cross-file=/usr/share/meson/cross/arm-linux-gnueabihf.ini -Dbuildtype=release -Ddocs=disabled -Dstrict=true -Dwerror=true + - meson setup build --cross-file=/usr/share/meson/cross/arm-linux-gnueabihf.ini -Dc_std=c11 -Dbuildtype=release -Ddocs=disabled -Dstrict=true -Dwerror=true - ninja -C build test @@ -27,14 +27,14 @@ arm64_dbg: <<: *build_definition image: lv2plugin/debian-arm64 script: - - meson setup build --cross-file=/usr/share/meson/cross/aarch64-linux-gnu.ini -Dbuildtype=debug -Ddocs=disabled -Dstrict=true -Dwerror=true + - meson setup build --cross-file=/usr/share/meson/cross/aarch64-linux-gnu.ini -Dc_std=c11 -Dbuildtype=debug -Ddocs=disabled -Dstrict=true -Dwerror=true - ninja -C build test arm64_rel: <<: *build_definition image: lv2plugin/debian-arm64 script: - - meson setup build --cross-file=/usr/share/meson/cross/aarch64-linux-gnu.ini -Dbuildtype=release -Ddocs=disabled -Dstrict=true -Dwerror=true + - meson setup build --cross-file=/usr/share/meson/cross/aarch64-linux-gnu.ini -Dc_std=c11 -Dbuildtype=release -Ddocs=disabled -Dstrict=true -Dwerror=true - ninja -C build test @@ -42,7 +42,7 @@ x64_dbg: <<: *build_definition image: lv2plugin/debian-x64 script: - - meson setup build -Dbuildtype=debug -Ddocs=enabled -Dstrict=true -Dwerror=true -Db_coverage=true + - meson setup build -Dc_std=c11 -Dbuildtype=debug -Ddocs=enabled -Dstrict=true -Dwerror=true -Db_coverage=true - ninja -C build test - ninja -C build coverage-html - mkdir -p build/doc/ @@ -60,7 +60,7 @@ x64_rel: <<: *build_definition image: lv2plugin/debian-x64 script: - - meson setup build -Dbuildtype=release -Ddocs=disabled -Dstrict=true -Dwerror=true + - meson setup build -Dc_std=c11 -Dbuildtype=release -Ddocs=disabled -Dstrict=true -Dwerror=true - ninja -C build test @@ -76,7 +76,7 @@ x64_sanitize: <<: *build_definition image: lv2plugin/debian-x64-clang script: - - meson setup build -Db_lundef=false -Dbuildtype=plain -Ddocs=disabled -Dstrict=true -Dwerror=true + - meson setup build -Db_lundef=false -Dc_std=c11 -Dbuildtype=plain -Ddocs=disabled -Dstrict=true -Dwerror=true - ninja -C build test variables: # TODO: Figure out how to enable address and undefined sanitizers on CI. @@ -93,7 +93,7 @@ mingw32_dbg: <<: *build_definition image: lv2plugin/debian-mingw32 script: - - meson setup build --cross-file=/usr/share/meson/cross/i686-w64-mingw32.ini -Dbuildtype=debug -Ddocs=disabled -Dstrict=true -Dwerror=true + - meson setup build --cross-file=/usr/share/meson/cross/i686-w64-mingw32.ini -Dc_std=c11 -Dbuildtype=debug -Ddocs=disabled -Dstrict=true -Dwerror=true - ninja -C build test variables: MESON_TESTTHREADS: "1" @@ -103,7 +103,7 @@ mingw32_rel: <<: *build_definition image: lv2plugin/debian-mingw32 script: - - meson setup build --cross-file=/usr/share/meson/cross/i686-w64-mingw32.ini -Dbuildtype=release -Ddocs=disabled -Dstrict=true -Dwerror=true + - meson setup build --cross-file=/usr/share/meson/cross/i686-w64-mingw32.ini -Dc_std=c11 -Dbuildtype=release -Ddocs=disabled -Dstrict=true -Dwerror=true - ninja -C build test variables: MESON_TESTTHREADS: "1" @@ -114,7 +114,7 @@ mingw64_dbg: <<: *build_definition image: lv2plugin/debian-mingw64 script: - - meson setup build --cross-file=/usr/share/meson/cross/x86_64-w64-mingw32.ini -Dbuildtype=debug -Ddocs=disabled -Dstrict=true -Dwerror=true + - meson setup build --cross-file=/usr/share/meson/cross/x86_64-w64-mingw32.ini -Dc_std=c11 -Dbuildtype=debug -Ddocs=disabled -Dstrict=true -Dwerror=true - ninja -C build test variables: MESON_TESTTHREADS: "1" @@ -124,7 +124,7 @@ mingw64_rel: <<: *build_definition image: lv2plugin/debian-mingw64 script: - - meson setup build --cross-file=/usr/share/meson/cross/x86_64-w64-mingw32.ini -Dbuildtype=release -Ddocs=disabled -Dstrict=true -Dwerror=true + - meson setup build --cross-file=/usr/share/meson/cross/x86_64-w64-mingw32.ini -Dc_std=c11 -Dbuildtype=release -Ddocs=disabled -Dstrict=true -Dwerror=true - ninja -C build test variables: MESON_TESTTHREADS: "1" @@ -135,14 +135,14 @@ mac_dbg: <<: *build_definition tags: [macos] script: - - meson setup build -Dbuildtype=debug -Ddocs=disabled -Dstrict=true -Dwerror=true + - meson setup build -Dc_std=c11 -Dbuildtype=debug -Ddocs=disabled -Dstrict=true -Dwerror=true - ninja -C build test mac_rel: <<: *build_definition tags: [macos] script: - - meson setup build -Dbuildtype=release -Ddocs=disabled -Dstrict=true -Dwerror=true + - meson setup build -Dc_std=c11 -Dbuildtype=release -Ddocs=disabled -Dstrict=true -Dwerror=true - ninja -C build test -- cgit v1.2.1