diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9fcdf27..04f235f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,7 @@ # :@activity: # e.g. fedora:31@build-default -.templates_sha: &template_sha 16f790f93f893394b70d7048fb0e8a981ceaa3c5 # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha 18194044f0f984c8815bc9a1a146582f6bf15d41 # see https://docs.gitlab.com/ee/ci/yaml/#includefile include: # Alpine container builder template @@ -91,13 +91,13 @@ variables: # changing these will force rebuilding the associated image # Note: these tags have no meaning and are not tied to a particular # libinput version - FEDORA_TAG: '2020-11-16.0' - DEBIAN_TAG: '2020-11-16.0' - UBUNTU_TAG: '2020-11-16.0' - ARCH_TAG: '2020-11-16.0' - ALPINE_TAG: '2020-11-16.0' - FREEBSD_TAG: '2020-11-16.0' - QEMU_TAG: 'qemu-vm-2020-11-16.0' + FEDORA_TAG: '2021-01-04.1' + DEBIAN_TAG: '2021-01-04.1' + UBUNTU_TAG: '2021-01-04.1' + ARCH_TAG: '2021-01-04.1' + ALPINE_TAG: '2021-01-04.1' + FREEBSD_TAG: '2021-01-04.1' + QEMU_TAG: 'qemu-vm-2021-01-04.1' FREEBSD_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/freebsd/11.2:$FREEBSD_TAG FDO_UPSTREAM_REPO: libinput/libinput @@ -178,7 +178,7 @@ check-commit: # Note: images are rebuilt weekly with a scheduled pipeline with FDO_FORCE_REBUILD set # # -fedora:32@qemu-prep: +fedora:33@qemu-prep: extends: - .fdo.qemu-build@fedora - .policy @@ -187,21 +187,10 @@ fedora:32@qemu-prep: - kvm variables: GIT_STRATEGY: none - FDO_DISTRIBUTION_VERSION: 32 + FDO_DISTRIBUTION_VERSION: 33 FDO_DISTRIBUTION_TAG: $QEMU_TAG FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES -fedora:31@container-prep: - extends: - - .fdo.container-build@fedora - - .policy - stage: prep - variables: - GIT_STRATEGY: none - FDO_DISTRIBUTION_VERSION: '31' - FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES - FDO_DISTRIBUTION_TAG: $FEDORA_TAG - fedora:32@container-prep: extends: - .fdo.container-build@fedora @@ -213,6 +202,17 @@ fedora:32@container-prep: FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES FDO_DISTRIBUTION_TAG: $FEDORA_TAG +fedora:33@container-prep: + extends: + - .fdo.container-build@fedora + - .policy + stage: prep + variables: + GIT_STRATEGY: none + FDO_DISTRIBUTION_VERSION: '33' + FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES + FDO_DISTRIBUTION_TAG: $FEDORA_TAG + debian:stable@container-prep: extends: - .fdo.container-build@debian @@ -352,15 +352,6 @@ freebsd:11.2@container-prep: only: - schedules -fedora:31@container-clean: - extends: - - .container-clean - variables: - GIT_STRATEGY: none - CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG - FDO_DISTRIBUTION_VERSION: '31' - FDO_DISTRIBUTION_TAG: $FEDORA_TAG - fedora:32@container-clean: extends: - .container-clean @@ -370,6 +361,15 @@ fedora:32@container-clean: FDO_DISTRIBUTION_VERSION: '32' FDO_DISTRIBUTION_TAG: $FEDORA_TAG +fedora:33@container-clean: + extends: + - .container-clean + variables: + GIT_STRATEGY: none + CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG + FDO_DISTRIBUTION_VERSION: '33' + FDO_DISTRIBUTION_TAG: $FEDORA_TAG + debian:stable@container-clean: extends: - .container-clean @@ -509,19 +509,19 @@ freebsd:11.2@container-clean: when: script_failure -.fedora:32@test-suite-vm: +.fedora:33@test-suite-vm: extends: - .test-suite-vm variables: - FDO_DISTRIBUTION_VERSION: 32 + FDO_DISTRIBUTION_VERSION: 33 FDO_DISTRIBUTION_TAG: $QEMU_TAG needs: - - "fedora:32@qemu-prep" + - "fedora:33@qemu-prep" vm-touchpad: extends: - - .fedora:32@test-suite-vm + - .fedora:33@test-suite-vm variables: SUITE_NAMES: 'touchpad' @@ -533,7 +533,7 @@ vm-touchpad-no-libwacom: vm-tap: extends: - - .fedora:32@test-suite-vm + - .fedora:33@test-suite-vm variables: SUITE_NAMES: 'tap' @@ -545,7 +545,7 @@ vm-tap-no-libwacom: vm-tablet: extends: - - .fedora:32@test-suite-vm + - .fedora:33@test-suite-vm variables: SUITE_NAMES: 'tablet' @@ -557,7 +557,7 @@ vm-tablet-no-libwacom: vm-gestures-device: extends: - - .fedora:32@test-suite-vm + - .fedora:33@test-suite-vm variables: SUITE_NAMES: 'gestures device' @@ -569,7 +569,7 @@ vm-gestures-device-no-libwacom: vm-others: extends: - - .fedora:32@test-suite-vm + - .fedora:33@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' @@ -581,7 +581,7 @@ vm-others-no-libwacom: vm-pointer: extends: - - .fedora:32@test-suite-vm + - .fedora:33@test-suite-vm variables: SUITE_NAMES: 'pointer' @@ -640,12 +640,12 @@ vm-valgrind-pointer: - .fdo.distribution-image@fedora - .build@template variables: - FDO_DISTRIBUTION_VERSION: '32' + FDO_DISTRIBUTION_VERSION: '33' FDO_DISTRIBUTION_TAG: $FEDORA_TAG needs: - - "fedora:32@container-prep" + - "fedora:33@container-prep" -default-build-release@fedora:32: +default-build-release@fedora:33: stage: distro extends: - .fedora-build@template @@ -653,7 +653,7 @@ default-build-release@fedora:32: MESON_ARGS: "-Dbuildtype=release" CFLAGS: "-Werror" -scan-build@fedora:32: +scan-build@fedora:33: extends: - .fedora-build@template variables: @@ -671,13 +671,13 @@ scan-build@fedora:32: # run them on one image, they shouldn't fail on one distro # when they succeed on another. -build-no-libwacom@fedora:32: +build-no-libwacom@fedora:33: extends: - .fedora-build@template variables: MESON_ARGS: "-Dlibwacom=false" -build-no-libwacom-nodeps@fedora:32: +build-no-libwacom-nodeps@fedora:33: extends: - .fedora-build@template variables: @@ -685,13 +685,13 @@ build-no-libwacom-nodeps@fedora:32: before_script: - dnf remove -y libwacom libwacom-devel -build-no-docs@fedora:32: +build-no-docs@fedora:33: extends: - .fedora-build@template variables: MESON_ARGS: "-Ddocumentation=false" -build-no-docs-nodeps@fedora:32: +build-no-docs-nodeps@fedora:33: extends: - .fedora-build@template variables: @@ -699,13 +699,13 @@ build-no-docs-nodeps@fedora:32: before_script: - dnf remove -y doxygen graphviz -build-no-debuggui@fedora:32: +build-no-debuggui@fedora:33: extends: - .fedora-build@template variables: MESON_ARGS: "-Ddebug-gui=false" -build-no-debuggui-nodeps@fedora:32: +build-no-debuggui-nodeps@fedora:33: extends: - .fedora-build@template variables: @@ -713,13 +713,13 @@ build-no-debuggui-nodeps@fedora:32: before_script: - dnf remove -y gtk3-devel -build-no-tests@fedora:32: +build-no-tests@fedora:33: extends: - .fedora-build@template variables: MESON_ARGS: "-Dtests=false" -build-no-tests-nodeps@fedora:32: +build-no-tests-nodeps@fedora:33: extends: - .fedora-build@template variables: @@ -727,7 +727,7 @@ build-no-tests-nodeps@fedora:32: before_script: - dnf remove -y check-devel -valgrind@fedora:32: +valgrind@fedora:33: extends: - .fedora-build@template variables: @@ -737,7 +737,7 @@ valgrind@fedora:32: # Python checks, only run on Fedora -usr-bin-env-python@fedora:32: +usr-bin-env-python@fedora:33: extends: - .fedora-build@template script: @@ -747,7 +747,7 @@ usr-bin-env-python@fedora:32: /bin/false fi -flake8@fedora:32: +flake8@fedora:33: extends: - .fedora-build@template before_script: @@ -811,18 +811,6 @@ coverity: # # ################################################################# -fedora:31@default-build: - stage: distro - extends: - - .build@template - - .fdo.distribution-image@fedora - variables: - FDO_DISTRIBUTION_VERSION: '31' - FDO_DISTRIBUTION_TAG: $FEDORA_TAG - needs: - - "fedora:31@container-prep" - - fedora:32@default-build: stage: distro extends: @@ -835,6 +823,18 @@ fedora:32@default-build: - "fedora:32@container-prep" +fedora:33@default-build: + stage: distro + extends: + - .build@template + - .fdo.distribution-image@fedora + variables: + FDO_DISTRIBUTION_VERSION: '33' + FDO_DISTRIBUTION_TAG: $FEDORA_TAG + needs: + - "fedora:33@container-prep" + + debian:stable@default-build: stage: distro extends: diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 5c5cabd7..28532542 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -32,7 +32,7 @@ # :@activity: # e.g. fedora:31@build-default -.templates_sha: &template_sha 16f790f93f893394b70d7048fb0e8a981ceaa3c5 # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha 18194044f0f984c8815bc9a1a146582f6bf15d41 # see https://docs.gitlab.com/ee/ci/yaml/#includefile include: {% for distro in distributions|sort(attribute="name") %} diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index 8f8dc85d..9b9a6137 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -3,14 +3,14 @@ # # We're happy to rebuild all containers when one changes. -.default_tag: &default_tag '2020-11-16.0' +.default_tag: &default_tag '2021-01-04.1' distributions: - name: fedora tag: *default_tag versions: - - '31' - '32' + - '33' want_qemu: true use_for_custom_build_tests: true packages: