From 2f9c40b5fbc6ca3361dcd9c271cf37b5d093cce8 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 17 Feb 2020 16:58:22 +1000 Subject: [PATCH] gitlab CI: add more targets for custom meson builds Notable: the meson builds don't have a "nm is missing" target because meson needs it for itself. Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 45 ++++++++++++++++++++++++++++++++++++++- .gitlab-ci/gitlab-ci.tmpl | 43 +++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db3bc32..23ad784 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -706,4 +706,47 @@ fedora:31@no-nm-autotools: fedora:31@enable-gcov-autotools: extends: .fedora-custom-build@autotools-template variables: - CONFIGURE_FLAGS: "--enable-gcov" \ No newline at end of file + CONFIGURE_FLAGS: "--enable-gcov" + +.fedora-custom-build@meson-template: + extends: .meson-build@template + stage: build + image: $FEDORA_CONTAINER_IMAGE + variables: + FEDORA_VERSION: 31 + needs: ['fedora:31@container-prep'] + +fedora:31@no-valgrind-meson: + extends: .fedora-custom-build@meson-template + before_script: + - dnf remove -y valgrind + +fedora:31@no-check-meson: + extends: .fedora-custom-build@meson-template + before_script: + - dnf remove -y check check-devel + variables: + MESON_ARGS: -Dtests=disabled + +# doxygen is required for dist +fedora:31@no-doxygen-meson: + extends: .fedora-custom-build@meson-template + before_script: + - dnf remove -y doxygen + variables: + MESON_ARGS: -Ddocumentation=disabled + NINJA_ARGS: '' + +# doxygen is required for dist +fedora:31@no-doxygen-check-valgrind-meson: + extends: .fedora-custom-build@meson-template + before_script: + - dnf remove -y doxygen valgrind check check-devel + variables: + MESON_ARGS: -Dtests=disabled -Ddocumentation=disabled + NINJA_ARGS: '' + +fedora:31@enable-gcov-meson: + extends: .fedora-custom-build@meson-template + variables: + MESON_ARGS: '-Dcoverity=true' \ No newline at end of file diff --git a/.gitlab-ci/gitlab-ci.tmpl b/.gitlab-ci/gitlab-ci.tmpl index 22972ee..70dfc96 100644 --- a/.gitlab-ci/gitlab-ci.tmpl +++ b/.gitlab-ci/gitlab-ci.tmpl @@ -379,3 +379,46 @@ fedora:31@enable-gcov-autotools: extends: .fedora-custom-build@autotools-template variables: CONFIGURE_FLAGS: "--enable-gcov" + +.fedora-custom-build@meson-template: + extends: .meson-build@template + stage: build + image: $FEDORA_CONTAINER_IMAGE + variables: + FEDORA_VERSION: 31 + needs: ['fedora:31@container-prep'] + +fedora:31@no-valgrind-meson: + extends: .fedora-custom-build@meson-template + before_script: + - dnf remove -y valgrind + +fedora:31@no-check-meson: + extends: .fedora-custom-build@meson-template + before_script: + - dnf remove -y check check-devel + variables: + MESON_ARGS: -Dtests=disabled + +# doxygen is required for dist +fedora:31@no-doxygen-meson: + extends: .fedora-custom-build@meson-template + before_script: + - dnf remove -y doxygen + variables: + MESON_ARGS: -Ddocumentation=disabled + NINJA_ARGS: '' + +# doxygen is required for dist +fedora:31@no-doxygen-check-valgrind-meson: + extends: .fedora-custom-build@meson-template + before_script: + - dnf remove -y doxygen valgrind check check-devel + variables: + MESON_ARGS: -Dtests=disabled -Ddocumentation=disabled + NINJA_ARGS: '' + +fedora:31@enable-gcov-meson: + extends: .fedora-custom-build@meson-template + variables: + MESON_ARGS: '-Dcoverity=true'