fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-08 11:19:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab CI: rename the custom build jobs

Browse source 
The distro we're running on is a side-effect, it's more important to see the
bit that describes what the job actually does.

And while we're there, shuffle the hierarchy a bit for less duplication.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-02-20 13:31:33 +10:00
parent 50d916467b
commit b2cda3f4b7
2 changed files with 32 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
.gitlab-ci.yml
View file

@ -638,22 +638,22 @@ fedora:30@valgrind-pointer:
extends: extends:
- .build@template - .build@template
image: $FEDORA_CONTAINER_IMAGE image: $FEDORA_CONTAINER_IMAGE
variables:
FEDORA_VERSION: 30
needs: ['fedora:30@container-prep']
fedora:30@default-build-release: default-build-release@fedora:30:
stage: distro stage: distro
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_ARGS: "-Dbuildtype=release" MESON_ARGS: "-Dbuildtype=release"
CFLAGS: "-Werror" CFLAGS: "-Werror"
needs: ['fedora:30@container-prep']
fedora:30@scan-build: scan-build@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
NINJA_ARGS: scan-build NINJA_ARGS: scan-build
before_script: before_script:
- dnf install -y clang-analyzer findutils - dnf install -y clang-analyzer findutils
@ -662,119 +662,94 @@ fedora:30@scan-build:
- test $(find "$MESON_BUILDDIR"/meson-logs/scanbuild -maxdepth 0 ! -empty -exec echo "not empty" \; | wc -l) -eq 0 && exit 0 - test $(find "$MESON_BUILDDIR"/meson-logs/scanbuild -maxdepth 0 ! -empty -exec echo "not empty" \; | wc -l) -eq 0 && exit 0
- echo "Check scan-build results" - echo "Check scan-build results"
- /bin/false - /bin/false
needs: ['fedora:30@container-prep']
# Below jobs are build option combinations. We only # Below jobs are build option combinations. We only
# run them on one image, they shouldn't fail on one distro # run them on one image, they shouldn't fail on one distro
# when they succeed on another. # when they succeed on another.
fedora:30@build-no-libwacom: build-no-libwacom@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_ARGS: "-Dlibwacom=false" MESON_ARGS: "-Dlibwacom=false"
needs: ['fedora:30@container-prep']
fedora:30@build-no-libwacom-nodeps: build-no-libwacom-nodeps@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_ARGS: "-Dlibwacom=false" MESON_ARGS: "-Dlibwacom=false"
before_script: before_script:
- dnf remove -y libwacom libwacom-devel - dnf remove -y libwacom libwacom-devel
needs: ['fedora:30@container-prep']
fedora:30@build-no-docs: build-no-docs@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_ARGS: "-Ddocumentation=false" MESON_ARGS: "-Ddocumentation=false"
needs: ['fedora:30@container-prep']
fedora:30@build-no-docs-nodeps: build-no-docs-nodeps@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_ARGS: "-Ddocumentation=false" MESON_ARGS: "-Ddocumentation=false"
before_script: before_script:
- dnf remove -y doxygen graphviz - dnf remove -y doxygen graphviz
needs: ['fedora:30@container-prep']
fedora:30@build-no-debuggui: build-no-debuggui@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_ARGS: "-Ddebug-gui=false" MESON_ARGS: "-Ddebug-gui=false"
needs: ['fedora:30@container-prep']
fedora:30@build-no-debuggui-nodeps: build-no-debuggui-nodeps@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_ARGS: "-Ddebug-gui=false" MESON_ARGS: "-Ddebug-gui=false"
before_script: before_script:
- dnf remove -y gtk3-devel - dnf remove -y gtk3-devel
needs: ['fedora:30@container-prep']
fedora:30@build-no-tests: build-no-tests@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_ARGS: "-Dtests=false" MESON_ARGS: "-Dtests=false"
needs: ['fedora:30@container-prep']
fedora:30@build-no-tests-nodeps: build-no-tests-nodeps@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_ARGS: "-Dtests=false" MESON_ARGS: "-Dtests=false"
before_script: before_script:
- dnf remove -y check-devel - dnf remove -y check-devel
needs: ['fedora:30@container-prep']
fedora:30@valgrind: valgrind@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_TEST_ARGS: '--suite=valgrind --no-suite=hardware --setup=valgrind' MESON_TEST_ARGS: '--suite=valgrind --no-suite=hardware --setup=valgrind'
before_script: before_script:
- dnf install -y valgrind - dnf install -y valgrind
needs: ['fedora:30@container-prep']
# Python checks, only run on Fedora # Python checks, only run on Fedora
fedora:30@usr-bin-env-python: usr-bin-env-python@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables:
FEDORA_VERSION: 30
script: script:
- | - |
if git grep -l '^#!/usr/bin/python'; then if git grep -l '^#!/usr/bin/python'; then
echo "Use '/usr/bin/env python3' in the above files"; echo "Use '/usr/bin/env python3' in the above files";
/bin/false /bin/false
fi fi
needs: ['fedora:30@container-prep']
fedora:30@flake8: flake8@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables:
FEDORA_VERSION: 30
before_script: before_script:
- dnf install -y python3-flake8 - dnf install -y python3-flake8
script: script:
- flake8-3 --ignore=W501,E501,W504 $(git grep -l '^#!/usr/bin/env python3') - flake8-3 --ignore=W501,E501,W504 $(git grep -l '^#!/usr/bin/env python3')
needs: ['fedora:30@container-prep']
################################################################# #################################################################
# # # #

57
.gitlab-ci/gitlab-ci.tmpl
View file

@ -466,22 +466,22 @@ fedora:30@valgrind-{{suite.name}}:
extends: extends:
- .build@template - .build@template
image: $FEDORA_CONTAINER_IMAGE image: $FEDORA_CONTAINER_IMAGE
variables:
FEDORA_VERSION: 30
needs: ['fedora:30@container-prep']
fedora:30@default-build-release: default-build-release@fedora:30:
stage: distro stage: distro
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_ARGS: "-Dbuildtype=release" MESON_ARGS: "-Dbuildtype=release"
CFLAGS: "-Werror" CFLAGS: "-Werror"
needs: ['fedora:30@container-prep']
fedora:30@scan-build: scan-build@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
NINJA_ARGS: scan-build NINJA_ARGS: scan-build
before_script: before_script:
- dnf install -y clang-analyzer findutils - dnf install -y clang-analyzer findutils
@ -490,119 +490,94 @@ fedora:30@scan-build:
- test $(find "$MESON_BUILDDIR"/meson-logs/scanbuild -maxdepth 0 ! -empty -exec echo "not empty" \; | wc -l) -eq 0 && exit 0 - test $(find "$MESON_BUILDDIR"/meson-logs/scanbuild -maxdepth 0 ! -empty -exec echo "not empty" \; | wc -l) -eq 0 && exit 0
- echo "Check scan-build results" - echo "Check scan-build results"
- /bin/false - /bin/false
needs: ['fedora:30@container-prep']
# Below jobs are build option combinations. We only # Below jobs are build option combinations. We only
# run them on one image, they shouldn't fail on one distro # run them on one image, they shouldn't fail on one distro
# when they succeed on another. # when they succeed on another.
fedora:30@build-no-libwacom: build-no-libwacom@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_ARGS: "-Dlibwacom=false" MESON_ARGS: "-Dlibwacom=false"
needs: ['fedora:30@container-prep']
fedora:30@build-no-libwacom-nodeps: build-no-libwacom-nodeps@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_ARGS: "-Dlibwacom=false" MESON_ARGS: "-Dlibwacom=false"
before_script: before_script:
- dnf remove -y libwacom libwacom-devel - dnf remove -y libwacom libwacom-devel
needs: ['fedora:30@container-prep']
fedora:30@build-no-docs: build-no-docs@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_ARGS: "-Ddocumentation=false" MESON_ARGS: "-Ddocumentation=false"
needs: ['fedora:30@container-prep']
fedora:30@build-no-docs-nodeps: build-no-docs-nodeps@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_ARGS: "-Ddocumentation=false" MESON_ARGS: "-Ddocumentation=false"
before_script: before_script:
- dnf remove -y doxygen graphviz - dnf remove -y doxygen graphviz
needs: ['fedora:30@container-prep']
fedora:30@build-no-debuggui: build-no-debuggui@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_ARGS: "-Ddebug-gui=false" MESON_ARGS: "-Ddebug-gui=false"
needs: ['fedora:30@container-prep']
fedora:30@build-no-debuggui-nodeps: build-no-debuggui-nodeps@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_ARGS: "-Ddebug-gui=false" MESON_ARGS: "-Ddebug-gui=false"
before_script: before_script:
- dnf remove -y gtk3-devel - dnf remove -y gtk3-devel
needs: ['fedora:30@container-prep']
fedora:30@build-no-tests: build-no-tests@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_ARGS: "-Dtests=false" MESON_ARGS: "-Dtests=false"
needs: ['fedora:30@container-prep']
fedora:30@build-no-tests-nodeps: build-no-tests-nodeps@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_ARGS: "-Dtests=false" MESON_ARGS: "-Dtests=false"
before_script: before_script:
- dnf remove -y check-devel - dnf remove -y check-devel
needs: ['fedora:30@container-prep']
fedora:30@valgrind: valgrind@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables: variables:
FEDORA_VERSION: 30
MESON_TEST_ARGS: '--suite=valgrind --no-suite=hardware --setup=valgrind' MESON_TEST_ARGS: '--suite=valgrind --no-suite=hardware --setup=valgrind'
before_script: before_script:
- dnf install -y valgrind - dnf install -y valgrind
needs: ['fedora:30@container-prep']
# Python checks, only run on Fedora # Python checks, only run on Fedora
fedora:30@usr-bin-env-python: usr-bin-env-python@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables:
FEDORA_VERSION: 30
script: script:
- | - |
if git grep -l '^#!/usr/bin/python'; then if git grep -l '^#!/usr/bin/python'; then
echo "Use '/usr/bin/env python3' in the above files"; echo "Use '/usr/bin/env python3' in the above files";
/bin/false /bin/false
fi fi
needs: ['fedora:30@container-prep']
fedora:30@flake8: flake8@fedora:30:
extends: extends:
- .fedora-build@template - .fedora-build@template
variables:
FEDORA_VERSION: 30
before_script: before_script:
- dnf install -y python3-flake8 - dnf install -y python3-flake8
script: script:
- flake8-3 --ignore=W501,E501,W504 $(git grep -l '^#!/usr/bin/env python3') - flake8-3 --ignore=W501,E501,W504 $(git grep -l '^#!/usr/bin/env python3')
needs: ['fedora:30@container-prep']
################################################################# #################################################################
# # # #