From e67826060b83b44a7f5f28ed9f0f5850017840da Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 18 Feb 2020 18:47:07 +1000 Subject: [PATCH] gitlab CI: rename the custom build jobs We don't really care that they're F31, that's an implementation detail. So let's rename them so we can easily pick which job is which on the pipeline overview. Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 28 ++++++++++++++-------------- .gitlab-ci/gitlab-ci.tmpl | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4652abe..78a0799 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -676,17 +676,17 @@ alpine:latest@meson-build: FEDORA_VERSION: 31 needs: ['fedora:31@container-prep'] -fedora:31@no-valgrind-autotools: +no-valgrind:autotools: extends: .fedora-custom-build@autotools-template before_script: - dnf remove -y valgrind -fedora:31@no-check-autotools: +no-check:autotools: extends: .fedora-custom-build@autotools-template before_script: - dnf remove -y check check-devel -fedora:31@no-doxygen-autotools: +no-doxygen:autotools: extends: .fedora-custom-build@autotools-template before_script: - dnf remove -y doxygen @@ -694,19 +694,19 @@ fedora:31@no-doxygen-autotools: MAKE_ARGS: '' # disable distcheck, requires doxygen # doxygen is required for distcheck -fedora:31@no-doxygen-check-valgrind-autotools: +no-doxygen-check-valgrind:autotools: extends: .fedora-custom-build@autotools-template before_script: - dnf remove -y doxygen valgrind check check-devel variables: MAKE_ARGS: '' # disable distcheck, requires doxygen -fedora:31@no-nm-autotools: +no-nm:autotools: extends: .fedora-custom-build@autotools-template before_script: - mv /usr/bin/nm /usr/bin/nm.moved -fedora:31@enable-gcov-autotools: +enable-gcov:autotools: extends: .fedora-custom-build@autotools-template variables: CONFIGURE_FLAGS: "--enable-gcov" @@ -719,12 +719,12 @@ fedora:31@enable-gcov-autotools: FEDORA_VERSION: 31 needs: ['fedora:31@container-prep'] -fedora:31@no-valgrind-meson: +no-valgrind:meson: extends: .fedora-custom-build@meson-template before_script: - dnf remove -y valgrind -fedora:31@no-check-meson: +no-check:meson: extends: .fedora-custom-build@meson-template before_script: - dnf remove -y check check-devel @@ -732,7 +732,7 @@ fedora:31@no-check-meson: MESON_ARGS: -Dtests=disabled # doxygen is required for dist -fedora:31@no-doxygen-meson: +no-doxygen:meson: extends: .fedora-custom-build@meson-template before_script: - dnf remove -y doxygen @@ -741,7 +741,7 @@ fedora:31@no-doxygen-meson: NINJA_ARGS: '' # doxygen is required for dist -fedora:31@no-doxygen-check-valgrind-meson: +no-doxygen-check-valgrind:meson: extends: .fedora-custom-build@meson-template before_script: - dnf remove -y doxygen valgrind check check-devel @@ -749,17 +749,17 @@ fedora:31@no-doxygen-check-valgrind-meson: MESON_ARGS: -Dtests=disabled -Ddocumentation=disabled NINJA_ARGS: '' -fedora:31@enable-gcov-meson: +enable-gcov:meson: extends: .fedora-custom-build@meson-template variables: MESON_ARGS: '-Dcoverity=true' -fedora:31@valgrind-meson: +valgrind:meson: extends: .fedora-custom-build@meson-template variables: MESON_TEST_ARGS: '--setup=valgrind' -fedora:31@meson-from-tarball: +meson-from-tarball: stage: tarballs image: $FEDORA_CONTAINER_IMAGE script: @@ -782,7 +782,7 @@ fedora:31@meson-from-tarball: FEDORA_VERSION: 31 needs: ['fedora:31@container-prep'] -fedora:31@autotools-from-tarball: +autotools-from-tarball: stage: tarballs image: $FEDORA_CONTAINER_IMAGE script: diff --git a/.gitlab-ci/gitlab-ci.tmpl b/.gitlab-ci/gitlab-ci.tmpl index 80af5ef..df8b89e 100644 --- a/.gitlab-ci/gitlab-ci.tmpl +++ b/.gitlab-ci/gitlab-ci.tmpl @@ -348,17 +348,17 @@ check-commit: FEDORA_VERSION: 31 needs: ['fedora:31@container-prep'] -fedora:31@no-valgrind-autotools: +no-valgrind:autotools: extends: .fedora-custom-build@autotools-template before_script: - dnf remove -y valgrind -fedora:31@no-check-autotools: +no-check:autotools: extends: .fedora-custom-build@autotools-template before_script: - dnf remove -y check check-devel -fedora:31@no-doxygen-autotools: +no-doxygen:autotools: extends: .fedora-custom-build@autotools-template before_script: - dnf remove -y doxygen @@ -366,19 +366,19 @@ fedora:31@no-doxygen-autotools: MAKE_ARGS: '' # disable distcheck, requires doxygen # doxygen is required for distcheck -fedora:31@no-doxygen-check-valgrind-autotools: +no-doxygen-check-valgrind:autotools: extends: .fedora-custom-build@autotools-template before_script: - dnf remove -y doxygen valgrind check check-devel variables: MAKE_ARGS: '' # disable distcheck, requires doxygen -fedora:31@no-nm-autotools: +no-nm:autotools: extends: .fedora-custom-build@autotools-template before_script: - mv /usr/bin/nm /usr/bin/nm.moved -fedora:31@enable-gcov-autotools: +enable-gcov:autotools: extends: .fedora-custom-build@autotools-template variables: CONFIGURE_FLAGS: "--enable-gcov" @@ -391,12 +391,12 @@ fedora:31@enable-gcov-autotools: FEDORA_VERSION: 31 needs: ['fedora:31@container-prep'] -fedora:31@no-valgrind-meson: +no-valgrind:meson: extends: .fedora-custom-build@meson-template before_script: - dnf remove -y valgrind -fedora:31@no-check-meson: +no-check:meson: extends: .fedora-custom-build@meson-template before_script: - dnf remove -y check check-devel @@ -404,7 +404,7 @@ fedora:31@no-check-meson: MESON_ARGS: -Dtests=disabled # doxygen is required for dist -fedora:31@no-doxygen-meson: +no-doxygen:meson: extends: .fedora-custom-build@meson-template before_script: - dnf remove -y doxygen @@ -413,7 +413,7 @@ fedora:31@no-doxygen-meson: NINJA_ARGS: '' # doxygen is required for dist -fedora:31@no-doxygen-check-valgrind-meson: +no-doxygen-check-valgrind:meson: extends: .fedora-custom-build@meson-template before_script: - dnf remove -y doxygen valgrind check check-devel @@ -421,17 +421,17 @@ fedora:31@no-doxygen-check-valgrind-meson: MESON_ARGS: -Dtests=disabled -Ddocumentation=disabled NINJA_ARGS: '' -fedora:31@enable-gcov-meson: +enable-gcov:meson: extends: .fedora-custom-build@meson-template variables: MESON_ARGS: '-Dcoverity=true' -fedora:31@valgrind-meson: +valgrind:meson: extends: .fedora-custom-build@meson-template variables: MESON_TEST_ARGS: '--setup=valgrind' -fedora:31@meson-from-tarball: +meson-from-tarball: stage: tarballs image: $FEDORA_CONTAINER_IMAGE script: @@ -454,7 +454,7 @@ fedora:31@meson-from-tarball: FEDORA_VERSION: 31 needs: ['fedora:31@container-prep'] -fedora:31@autotools-from-tarball: +autotools-from-tarball: stage: tarballs image: $FEDORA_CONTAINER_IMAGE script: