diff options
| author | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2022-08-11 07:19:14 +0200 |
|---|---|---|
| committer | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2022-09-02 08:41:28 +0200 |
| commit | 24956221b9f05f5a71935dcaa053029a285ae528 (patch) | |
| tree | b533249a1fbaa50436309e5d98ea9d739e4e9b08 /.gitlab-ci.yml | |
| parent | a034a9f66b7ed5276cdd6da464a50eeee7f61f0c (diff) | |
| download | libinput-24956221b9f05f5a71935dcaa053029a285ae528.tar.gz | |
CI: in b2c, compile on the host, then test in qemu
Looks like we are having clock skew issues on qemu, so given that
we just need qemu in the image, we can compile on the host (reliable)
and then only start the tests in qemu.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42c48ef9..13cd24f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,7 +76,7 @@ variables: # See the documentation here: # # https://wayland.freedesktop.org/libinput/doc/latest/building_libinput.html # ############################################################################### - 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 gtk4-devel glib2-devel mtdev-devel diffutils wayland-protocols-devel valgrind systemd-udev' + 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 gtk4-devel glib2-devel mtdev-devel diffutils wayland-protocols-devel valgrind systemd-udev qemu-img qemu-system-x86-core qemu-system-aarch64-core jq python3-click python3-rich' 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 curl' 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 gtk4 mtdev diffutils wayland-protocols' @@ -88,12 +88,12 @@ 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: '2022-08-08.0' - DEBIAN_TAG: '2022-08-08.0' - UBUNTU_TAG: '2022-08-08.0' - ARCH_TAG: '2022-08-08.0' - ALPINE_TAG: '2022-08-08.0' - FREEBSD_TAG: '2022-08-08.0' + FEDORA_TAG: '2022-09-02.0' + DEBIAN_TAG: '2022-09-02.0' + UBUNTU_TAG: '2022-09-02.0' + ARCH_TAG: '2022-09-02.0' + ALPINE_TAG: '2022-09-02.0' + FREEBSD_TAG: '2022-09-02.0' FDO_UPSTREAM_REPO: libinput/libinput @@ -397,7 +397,6 @@ freebsd:13.0@container-clean: .build-in-b2c@template: extends: - .policy - - .fdo.b2c-image@fedora - .default_artifacts tags: - kvm @@ -408,9 +407,14 @@ freebsd:13.0@container-clean: B2C_IMAGE: $FDO_DISTRIBUTION_IMAGE B2C_COMMAND: .gitlab-ci/start-in-systemd.sh script: + # first build in the host container + - .gitlab-ci/meson-build.sh --skip-test + # pull b2c - curl -L -o /app/boot2container https://gitlab.freedesktop.org/mupuf/boot2container/-/raw/v0.9.8/vm2c.py - chmod +x /app/boot2container + + # runs the test suite only - /app/boot2container # @@ -490,6 +494,7 @@ freebsd:13.0@container-clean: .fedora:36@test-suite-vm: extends: + - .fdo.distribution-image@fedora - .test-suite-vm variables: FDO_DISTRIBUTION_VERSION: 36 |