mirror of
https://gitlab.freedesktop.org/libinput/libinput.git
synced 2026-02-05 05:10:26 +01:00
gitlab CI: update the various build tests to F32
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
cbf55a6264
commit
d946c062d8
3 changed files with 81 additions and 47 deletions
|
|
@ -181,7 +181,7 @@ check-commit:
|
|||
# force rebuild if schedule, reuse otherwise
|
||||
- if [[ $CI_PIPELINE_SOURCE == "schedule" ]] ; then export FDO_FORCE_REBUILD=1; fi
|
||||
|
||||
fedora:30@qemu-prep:
|
||||
fedora:32@qemu-prep:
|
||||
extends:
|
||||
- .fdo.qemu-build@fedora
|
||||
- .policy
|
||||
|
|
@ -191,7 +191,7 @@ fedora:30@qemu-prep:
|
|||
- kvm
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
FDO_DISTRIBUTION_VERSION: 30
|
||||
FDO_DISTRIBUTION_VERSION: 32
|
||||
FDO_DISTRIBUTION_TAG: $QEMU_TAG
|
||||
FDO_DISTRIBUTION_PACKAGES: $FEDORA_QEMU_RPMS
|
||||
allow_failure: true
|
||||
|
|
@ -220,6 +220,18 @@ fedora:31@container-prep:
|
|||
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
|
||||
fedora:32@container-prep:
|
||||
extends:
|
||||
- .fdo.container-build@fedora
|
||||
- .policy
|
||||
- .rebuild_for_schedule
|
||||
stage: prep
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
FDO_DISTRIBUTION_VERSION: '32'
|
||||
FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
|
||||
ubuntu:19.10@container-prep:
|
||||
extends:
|
||||
- .fdo.container-build@ubuntu
|
||||
|
|
@ -376,6 +388,16 @@ fedora:31@container-clean:
|
|||
FDO_DISTRIBUTION_VERSION: '31'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
|
||||
fedora:32@container-clean:
|
||||
extends:
|
||||
- .container-clean
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
FEDORA_VERSION: '32'
|
||||
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
|
||||
FDO_DISTRIBUTION_VERSION: '32'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
|
||||
ubuntu:19.10@container-clean:
|
||||
extends:
|
||||
- .container-clean
|
||||
|
|
@ -513,18 +535,18 @@ freebsd:11.2@container-clean:
|
|||
when: script_failure
|
||||
|
||||
|
||||
.fedora:30@test-suite-vm:
|
||||
.fedora:32@test-suite-vm:
|
||||
extends:
|
||||
- .test-suite-vm
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: 30
|
||||
FDO_DISTRIBUTION_VERSION: 32
|
||||
FDO_DISTRIBUTION_TAG: $QEMU_TAG
|
||||
needs: ['fedora:30@qemu-prep']
|
||||
needs: ['fedora:32@qemu-prep']
|
||||
|
||||
|
||||
vm-touchpad:
|
||||
extends:
|
||||
- .fedora:30@test-suite-vm
|
||||
- .fedora:32@test-suite-vm
|
||||
variables:
|
||||
SUITE_NAMES: 'touchpad'
|
||||
|
||||
|
|
@ -536,7 +558,7 @@ vm-touchpad-no-libwacom:
|
|||
|
||||
vm-tap:
|
||||
extends:
|
||||
- .fedora:30@test-suite-vm
|
||||
- .fedora:32@test-suite-vm
|
||||
variables:
|
||||
SUITE_NAMES: 'tap'
|
||||
|
||||
|
|
@ -548,7 +570,7 @@ vm-tap-no-libwacom:
|
|||
|
||||
vm-tablet:
|
||||
extends:
|
||||
- .fedora:30@test-suite-vm
|
||||
- .fedora:32@test-suite-vm
|
||||
variables:
|
||||
SUITE_NAMES: 'tablet'
|
||||
|
||||
|
|
@ -560,7 +582,7 @@ vm-tablet-no-libwacom:
|
|||
|
||||
vm-gestures-device:
|
||||
extends:
|
||||
- .fedora:30@test-suite-vm
|
||||
- .fedora:32@test-suite-vm
|
||||
variables:
|
||||
SUITE_NAMES: 'gestures device'
|
||||
|
||||
|
|
@ -572,7 +594,7 @@ vm-gestures-device-no-libwacom:
|
|||
|
||||
vm-others:
|
||||
extends:
|
||||
- .fedora:30@test-suite-vm
|
||||
- .fedora:32@test-suite-vm
|
||||
variables:
|
||||
SUITE_NAMES: 'context config misc events totem udev lid log timer tablet-mode quirks trackball pad path keyboard switch touch trackpoint'
|
||||
|
||||
|
|
@ -584,7 +606,7 @@ vm-others-no-libwacom:
|
|||
|
||||
vm-pointer:
|
||||
extends:
|
||||
- .fedora:30@test-suite-vm
|
||||
- .fedora:32@test-suite-vm
|
||||
variables:
|
||||
SUITE_NAMES: 'pointer'
|
||||
|
||||
|
|
@ -644,11 +666,11 @@ vm-valgrind-pointer:
|
|||
- .fdo.distribution-image@fedora
|
||||
- .build@template
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '30'
|
||||
FDO_DISTRIBUTION_VERSION: '32'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
needs: ['fedora:30@container-prep']
|
||||
needs: ['fedora:32@container-prep']
|
||||
|
||||
default-build-release@fedora:30:
|
||||
default-build-release@fedora:32:
|
||||
stage: distro
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
|
|
@ -656,7 +678,7 @@ default-build-release@fedora:30:
|
|||
MESON_ARGS: "-Dbuildtype=release"
|
||||
CFLAGS: "-Werror"
|
||||
|
||||
scan-build@fedora:30:
|
||||
scan-build@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
|
|
@ -674,13 +696,13 @@ scan-build@fedora:30:
|
|||
# run them on one image, they shouldn't fail on one distro
|
||||
# when they succeed on another.
|
||||
|
||||
build-no-libwacom@fedora:30:
|
||||
build-no-libwacom@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
MESON_ARGS: "-Dlibwacom=false"
|
||||
|
||||
build-no-libwacom-nodeps@fedora:30:
|
||||
build-no-libwacom-nodeps@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
|
|
@ -688,13 +710,13 @@ build-no-libwacom-nodeps@fedora:30:
|
|||
before_script:
|
||||
- dnf remove -y libwacom libwacom-devel
|
||||
|
||||
build-no-docs@fedora:30:
|
||||
build-no-docs@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
MESON_ARGS: "-Ddocumentation=false"
|
||||
|
||||
build-no-docs-nodeps@fedora:30:
|
||||
build-no-docs-nodeps@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
|
|
@ -702,13 +724,13 @@ build-no-docs-nodeps@fedora:30:
|
|||
before_script:
|
||||
- dnf remove -y doxygen graphviz
|
||||
|
||||
build-no-debuggui@fedora:30:
|
||||
build-no-debuggui@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
MESON_ARGS: "-Ddebug-gui=false"
|
||||
|
||||
build-no-debuggui-nodeps@fedora:30:
|
||||
build-no-debuggui-nodeps@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
|
|
@ -716,13 +738,13 @@ build-no-debuggui-nodeps@fedora:30:
|
|||
before_script:
|
||||
- dnf remove -y gtk3-devel
|
||||
|
||||
build-no-tests@fedora:30:
|
||||
build-no-tests@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
MESON_ARGS: "-Dtests=false"
|
||||
|
||||
build-no-tests-nodeps@fedora:30:
|
||||
build-no-tests-nodeps@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
|
|
@ -730,7 +752,7 @@ build-no-tests-nodeps@fedora:30:
|
|||
before_script:
|
||||
- dnf remove -y check-devel
|
||||
|
||||
valgrind@fedora:30:
|
||||
valgrind@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
|
|
@ -740,7 +762,7 @@ valgrind@fedora:30:
|
|||
|
||||
# Python checks, only run on Fedora
|
||||
|
||||
usr-bin-env-python@fedora:30:
|
||||
usr-bin-env-python@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
script:
|
||||
|
|
@ -750,7 +772,7 @@ usr-bin-env-python@fedora:30:
|
|||
/bin/false
|
||||
fi
|
||||
|
||||
flake8@fedora:30:
|
||||
flake8@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
before_script:
|
||||
|
|
@ -786,6 +808,17 @@ fedora:31@default-build:
|
|||
needs: ['fedora:31@container-prep']
|
||||
|
||||
|
||||
fedora:32@default-build:
|
||||
stage: distro
|
||||
extends:
|
||||
- .build@template
|
||||
- .fdo.distribution-image@fedora
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '32'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
needs: ['fedora:32@container-prep']
|
||||
|
||||
|
||||
ubuntu:19.10@default-build:
|
||||
stage: distro
|
||||
extends:
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ check-commit:
|
|||
# force rebuild if schedule, reuse otherwise
|
||||
- if [[ $CI_PIPELINE_SOURCE == "schedule" ]] ; then export FDO_FORCE_REBUILD=1; fi
|
||||
|
||||
fedora:30@qemu-prep:
|
||||
fedora:32@qemu-prep:
|
||||
extends:
|
||||
- .fdo.qemu-build@fedora
|
||||
- .policy
|
||||
|
|
@ -187,7 +187,7 @@ fedora:30@qemu-prep:
|
|||
- kvm
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
FDO_DISTRIBUTION_VERSION: 30
|
||||
FDO_DISTRIBUTION_VERSION: 32
|
||||
FDO_DISTRIBUTION_TAG: $QEMU_TAG
|
||||
FDO_DISTRIBUTION_PACKAGES: $FEDORA_QEMU_RPMS
|
||||
allow_failure: true
|
||||
|
|
@ -410,19 +410,19 @@ freebsd:11.2@container-clean:
|
|||
when: script_failure
|
||||
|
||||
|
||||
.fedora:30@test-suite-vm:
|
||||
.fedora:32@test-suite-vm:
|
||||
extends:
|
||||
- .test-suite-vm
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: 30
|
||||
FDO_DISTRIBUTION_VERSION: 32
|
||||
FDO_DISTRIBUTION_TAG: $QEMU_TAG
|
||||
needs: ['fedora:30@qemu-prep']
|
||||
needs: ['fedora:32@qemu-prep']
|
||||
|
||||
|
||||
{% for suite in test_suites %}
|
||||
vm-{{suite.name}}:
|
||||
extends:
|
||||
- .fedora:30@test-suite-vm
|
||||
- .fedora:32@test-suite-vm
|
||||
variables:
|
||||
SUITE_NAMES: '{{suite.suites}}'
|
||||
|
||||
|
|
@ -450,11 +450,11 @@ vm-valgrind-{{suite.name}}:
|
|||
- .fdo.distribution-image@fedora
|
||||
- .build@template
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '30'
|
||||
FDO_DISTRIBUTION_VERSION: '32'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
needs: ['fedora:30@container-prep']
|
||||
needs: ['fedora:32@container-prep']
|
||||
|
||||
default-build-release@fedora:30:
|
||||
default-build-release@fedora:32:
|
||||
stage: distro
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
|
|
@ -462,7 +462,7 @@ default-build-release@fedora:30:
|
|||
MESON_ARGS: "-Dbuildtype=release"
|
||||
CFLAGS: "-Werror"
|
||||
|
||||
scan-build@fedora:30:
|
||||
scan-build@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
|
|
@ -480,13 +480,13 @@ scan-build@fedora:30:
|
|||
# run them on one image, they shouldn't fail on one distro
|
||||
# when they succeed on another.
|
||||
|
||||
build-no-libwacom@fedora:30:
|
||||
build-no-libwacom@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
MESON_ARGS: "-Dlibwacom=false"
|
||||
|
||||
build-no-libwacom-nodeps@fedora:30:
|
||||
build-no-libwacom-nodeps@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
|
|
@ -494,13 +494,13 @@ build-no-libwacom-nodeps@fedora:30:
|
|||
before_script:
|
||||
- dnf remove -y libwacom libwacom-devel
|
||||
|
||||
build-no-docs@fedora:30:
|
||||
build-no-docs@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
MESON_ARGS: "-Ddocumentation=false"
|
||||
|
||||
build-no-docs-nodeps@fedora:30:
|
||||
build-no-docs-nodeps@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
|
|
@ -508,13 +508,13 @@ build-no-docs-nodeps@fedora:30:
|
|||
before_script:
|
||||
- dnf remove -y doxygen graphviz
|
||||
|
||||
build-no-debuggui@fedora:30:
|
||||
build-no-debuggui@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
MESON_ARGS: "-Ddebug-gui=false"
|
||||
|
||||
build-no-debuggui-nodeps@fedora:30:
|
||||
build-no-debuggui-nodeps@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
|
|
@ -522,13 +522,13 @@ build-no-debuggui-nodeps@fedora:30:
|
|||
before_script:
|
||||
- dnf remove -y gtk3-devel
|
||||
|
||||
build-no-tests@fedora:30:
|
||||
build-no-tests@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
MESON_ARGS: "-Dtests=false"
|
||||
|
||||
build-no-tests-nodeps@fedora:30:
|
||||
build-no-tests-nodeps@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
|
|
@ -536,7 +536,7 @@ build-no-tests-nodeps@fedora:30:
|
|||
before_script:
|
||||
- dnf remove -y check-devel
|
||||
|
||||
valgrind@fedora:30:
|
||||
valgrind@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
variables:
|
||||
|
|
@ -546,7 +546,7 @@ valgrind@fedora:30:
|
|||
|
||||
# Python checks, only run on Fedora
|
||||
|
||||
usr-bin-env-python@fedora:30:
|
||||
usr-bin-env-python@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
script:
|
||||
|
|
@ -556,7 +556,7 @@ usr-bin-env-python@fedora:30:
|
|||
/bin/false
|
||||
fi
|
||||
|
||||
flake8@fedora:30:
|
||||
flake8@fedora:32:
|
||||
extends:
|
||||
- .fedora-build@template
|
||||
before_script:
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ distributions:
|
|||
versions:
|
||||
- '30'
|
||||
- '31'
|
||||
- '32'
|
||||
want_qemu: true
|
||||
ci_templates: true
|
||||
- name: ubuntu
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue