From: Peter Hutterer Date: Wed, 11 Nov 2020 01:16:06 +0000 (+1000) Subject: gitlab CI: switch the coverity job to Debian stable X-Git-Tag: 1.16.901~37 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b2dbe19605bf3a39ee19cd0c9a684b0e633e30fb;p=platform%2Fupstream%2Flibinput.git gitlab CI: switch the coverity job to Debian stable coverity doesn't work with gcc 10, it fails with "invalid GNU version number: 201". F31 is about to be EOL but we can't use to F32 or later. So let's switch to debian stable instead, that one will stick around for a bit longer. Debian packages are the same as the Ubuntu packages Signed-off-by: Peter Hutterer --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8aa70aa..e118b78 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,6 +41,10 @@ include: - project: 'freedesktop/ci-templates' ref: *template_sha file: '/templates/arch.yml' + # Debian container builder template + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/debian.yml' # Fedora container builder template - project: 'freedesktop/ci-templates' ref: *template_sha @@ -72,6 +76,7 @@ variables: ############################################################################### FEDORA_PACKAGES: 'git-core gcc gcc-c++ pkgconf-pkg-config meson check-devel libudev-devel libevdev-devel doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx_rtd_theme python3-pytest-xdist libwacom-devel cairo-devel gtk3-devel glib2-devel mtdev-devel diffutils' FEDORA_QEMU_RPMS: 'git-core gcc gcc-c++ pkgconf-pkg-config meson check-devel libudev-devel libevdev-devel doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx_rtd_theme python3-pytest-xdist libwacom-devel cairo-devel gtk3-devel glib2-devel mtdev-devel diffutils valgrind' + DEBIAN_PACKAGES: 'git gcc g++ pkg-config meson check libudev-dev libevdev-dev doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx-rtd-theme python3-pytest-xdist libwacom-dev libcairo2-dev libgtk-3-dev libglib2.0-dev libmtdev-dev' UBUNTU_PACKAGES: 'git gcc g++ pkg-config meson check libudev-dev libevdev-dev doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx-rtd-theme python3-pytest-xdist libwacom-dev libcairo2-dev libgtk-3-dev libglib2.0-dev libmtdev-dev' ARCH_PACKAGES: 'git gcc pkgconfig meson check libsystemd libevdev doxygen graphviz python-sphinx python-recommonmark python-sphinx_rtd_theme python-pytest-xdist libwacom gtk3 mtdev diffutils' FREEBSD_BUILD_PKGS: 'meson' @@ -84,6 +89,7 @@ variables: # Note: these tags have no meaning and are not tied to a particular # libinput version FEDORA_TAG: '2020-07-22.0' + DEBIAN_TAG: '2020-07-22.0' UBUNTU_TAG: '2020-07-22.0' ARCH_TAG: '2020-07-22.0' ALPINE_TAG: '2020-07-22.0' @@ -224,6 +230,17 @@ fedora:32@container-prep: FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES FDO_DISTRIBUTION_TAG: $FEDORA_TAG +debian:stable@container-prep: + extends: + - .fdo.container-build@debian + - .policy + stage: prep + variables: + GIT_STRATEGY: none + FDO_DISTRIBUTION_VERSION: 'stable' + FDO_DISTRIBUTION_PACKAGES: $DEBIAN_PACKAGES + FDO_DISTRIBUTION_TAG: $DEBIAN_TAG + ubuntu:19.10@container-prep: extends: - .fdo.container-build@ubuntu @@ -359,6 +376,15 @@ fedora:32@container-clean: FDO_DISTRIBUTION_VERSION: '32' FDO_DISTRIBUTION_TAG: $FEDORA_TAG +debian:stable@container-clean: + extends: + - .container-clean + variables: + GIT_STRATEGY: none + CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/debian/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG + FDO_DISTRIBUTION_VERSION: 'stable' + FDO_DISTRIBUTION_TAG: $DEBIAN_TAG + ubuntu:19.10@container-clean: extends: - .container-clean @@ -743,13 +769,12 @@ flake8@fedora:32: # coverity: extends: - - .fdo.distribution-image@fedora + - .fdo.distribution-image@debian - .policy stage: build variables: - # coverity doesn't work on Fedora 32 - FDO_DISTRIBUTION_VERSION: '31' - FDO_DISTRIBUTION_TAG: $FEDORA_TAG + FDO_DISTRIBUTION_VERSION: 'stable' + FDO_DISTRIBUTION_TAG: $DEBIAN_TAG # so git-describe works, or should work GIT_DEPTH: 200 only: @@ -776,7 +801,7 @@ coverity: paths: - cov-int.tar.gz needs: - - "fedora:31@container-prep" + - "debian:stable@container-prep" ################################################################# # # @@ -808,6 +833,18 @@ fedora:32@default-build: - "fedora:32@container-prep" +debian:stable@default-build: + stage: distro + extends: + - .build@template + - .fdo.distribution-image@debian + variables: + FDO_DISTRIBUTION_VERSION: 'stable' + FDO_DISTRIBUTION_TAG: $DEBIAN_TAG + needs: + - "debian:stable@container-prep" + + ubuntu:19.10@default-build: stage: distro extends: diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index f06a33e..32e8a34 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -66,6 +66,7 @@ variables: ############################################################################### FEDORA_PACKAGES: 'git-core gcc gcc-c++ pkgconf-pkg-config meson check-devel libudev-devel libevdev-devel doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx_rtd_theme python3-pytest-xdist libwacom-devel cairo-devel gtk3-devel glib2-devel mtdev-devel diffutils' FEDORA_QEMU_RPMS: 'git-core gcc gcc-c++ pkgconf-pkg-config meson check-devel libudev-devel libevdev-devel doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx_rtd_theme python3-pytest-xdist libwacom-devel cairo-devel gtk3-devel glib2-devel mtdev-devel diffutils valgrind' + DEBIAN_PACKAGES: 'git gcc g++ pkg-config meson check libudev-dev libevdev-dev doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx-rtd-theme python3-pytest-xdist libwacom-dev libcairo2-dev libgtk-3-dev libglib2.0-dev libmtdev-dev' UBUNTU_PACKAGES: 'git gcc g++ pkg-config meson check libudev-dev libevdev-dev doxygen graphviz python3-sphinx python3-recommonmark python3-sphinx-rtd-theme python3-pytest-xdist libwacom-dev libcairo2-dev libgtk-3-dev libglib2.0-dev libmtdev-dev' ARCH_PACKAGES: 'git gcc pkgconfig meson check libsystemd libevdev doxygen graphviz python-sphinx python-recommonmark python-sphinx_rtd_theme python-pytest-xdist libwacom gtk3 mtdev diffutils' FREEBSD_BUILD_PKGS: 'meson' @@ -590,13 +591,12 @@ flake8@{{distro.name}}:{{version}}: # coverity: extends: - - .fdo.distribution-image@fedora + - .fdo.distribution-image@debian - .policy stage: build variables: - # coverity doesn't work on Fedora 32 - FDO_DISTRIBUTION_VERSION: '31' - FDO_DISTRIBUTION_TAG: $FEDORA_TAG + FDO_DISTRIBUTION_VERSION: 'stable' + FDO_DISTRIBUTION_TAG: $DEBIAN_TAG # so git-describe works, or should work GIT_DEPTH: 200 only: @@ -623,7 +623,7 @@ coverity: paths: - cov-int.tar.gz needs: - - "fedora:31@container-prep" + - "debian:stable@container-prep" ################################################################# # # diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index 36d1d04..26bc0bd 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -13,6 +13,10 @@ distributions: - '32' want_qemu: true use_for_custom_build_tests: true + - name: debian + tag: *default_tag + versions: + - 'stable' - name: ubuntu tag: *default_tag versions: