gitlab CI: rename few targets for autotools

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-02-17 16:54:52 +10:00
parent 12f9ec84d9
commit f2d4ef6cc4
2 changed files with 26 additions and 26 deletions

View file

@ -665,7 +665,7 @@ alpine:latest@meson-build:
# #
# We only run the build option combinations on one image # We only run the build option combinations on one image
# because they're supposed to fail equally on all # because they're supposed to fail equally on all
.fedora-custom-build@template: .fedora-custom-build@autotools-template:
extends: .autotools-build@template extends: .autotools-build@template
stage: build stage: build
image: $FEDORA_CONTAINER_IMAGE image: $FEDORA_CONTAINER_IMAGE
@ -673,37 +673,37 @@ alpine:latest@meson-build:
FEDORA_VERSION: 31 FEDORA_VERSION: 31
needs: ['fedora:31@container-prep'] needs: ['fedora:31@container-prep']
fedora:31@no-valgrind: fedora:31@no-valgrind-autotools:
extends: .fedora-custom-build@template extends: .fedora-custom-build@autotools-template
before_script: before_script:
- dnf remove -y valgrind - dnf remove -y valgrind
fedora:31@no-check: fedora:31@no-check-autotools:
extends: .fedora-custom-build@template extends: .fedora-custom-build@autotools-template
before_script: before_script:
- dnf remove -y check check-devel - dnf remove -y check check-devel
fedora:31@no-doxygen: fedora:31@no-doxygen-autotools:
extends: .fedora-custom-build@template extends: .fedora-custom-build@autotools-template
before_script: before_script:
- dnf remove -y doxygen - dnf remove -y doxygen
variables: variables:
MAKE_ARGS: '' # disable distcheck, requires doxygen MAKE_ARGS: '' # disable distcheck, requires doxygen
# doxygen is required for distcheck # doxygen is required for distcheck
fedora:31@no-doxygen-check-valgrind: fedora:31@no-doxygen-check-valgrind-autotools:
extends: .fedora-custom-build@template extends: .fedora-custom-build@autotools-template
before_script: before_script:
- dnf remove -y doxygen valgrind check check-devel - dnf remove -y doxygen valgrind check check-devel
variables: variables:
MAKE_ARGS: '' # disable distcheck, requires doxygen MAKE_ARGS: '' # disable distcheck, requires doxygen
fedora:31@no-nm: fedora:31@no-nm-autotools:
extends: .fedora-custom-build@template extends: .fedora-custom-build@autotools-template
before_script: before_script:
- mv /usr/bin/nm /usr/bin/nm.moved - mv /usr/bin/nm /usr/bin/nm.moved
fedora:31@enable-gcov: fedora:31@enable-gcov-autotools:
extends: .fedora-custom-build@template extends: .fedora-custom-build@autotools-template
variables: variables:
CONFIGURE_FLAGS: "--enable-gcov" CONFIGURE_FLAGS: "--enable-gcov"

View file

@ -337,7 +337,7 @@ check-commit:
# #
# We only run the build option combinations on one image # We only run the build option combinations on one image
# because they're supposed to fail equally on all # because they're supposed to fail equally on all
.fedora-custom-build@template: .fedora-custom-build@autotools-template:
extends: .autotools-build@template extends: .autotools-build@template
stage: build stage: build
image: $FEDORA_CONTAINER_IMAGE image: $FEDORA_CONTAINER_IMAGE
@ -345,37 +345,37 @@ check-commit:
FEDORA_VERSION: 31 FEDORA_VERSION: 31
needs: ['fedora:31@container-prep'] needs: ['fedora:31@container-prep']
fedora:31@no-valgrind: fedora:31@no-valgrind-autotools:
extends: .fedora-custom-build@template extends: .fedora-custom-build@autotools-template
before_script: before_script:
- dnf remove -y valgrind - dnf remove -y valgrind
fedora:31@no-check: fedora:31@no-check-autotools:
extends: .fedora-custom-build@template extends: .fedora-custom-build@autotools-template
before_script: before_script:
- dnf remove -y check check-devel - dnf remove -y check check-devel
fedora:31@no-doxygen: fedora:31@no-doxygen-autotools:
extends: .fedora-custom-build@template extends: .fedora-custom-build@autotools-template
before_script: before_script:
- dnf remove -y doxygen - dnf remove -y doxygen
variables: variables:
MAKE_ARGS: '' # disable distcheck, requires doxygen MAKE_ARGS: '' # disable distcheck, requires doxygen
# doxygen is required for distcheck # doxygen is required for distcheck
fedora:31@no-doxygen-check-valgrind: fedora:31@no-doxygen-check-valgrind-autotools:
extends: .fedora-custom-build@template extends: .fedora-custom-build@autotools-template
before_script: before_script:
- dnf remove -y doxygen valgrind check check-devel - dnf remove -y doxygen valgrind check check-devel
variables: variables:
MAKE_ARGS: '' # disable distcheck, requires doxygen MAKE_ARGS: '' # disable distcheck, requires doxygen
fedora:31@no-nm: fedora:31@no-nm-autotools:
extends: .fedora-custom-build@template extends: .fedora-custom-build@autotools-template
before_script: before_script:
- mv /usr/bin/nm /usr/bin/nm.moved - mv /usr/bin/nm /usr/bin/nm.moved
fedora:31@enable-gcov: fedora:31@enable-gcov-autotools:
extends: .fedora-custom-build@template extends: .fedora-custom-build@autotools-template
variables: variables:
CONFIGURE_FLAGS: "--enable-gcov" CONFIGURE_FLAGS: "--enable-gcov"