diff options
| author | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2021-07-29 18:54:45 +0200 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2022-09-01 09:39:02 +1000 |
| commit | 553092ea93edb9290b43954d7cf9610e7350d8c1 (patch) | |
| tree | 1b1998a5584d564d2102904c1dbe71e1653958d9 /.gitlab-ci.yml | |
| parent | 0d602e12a4b66d5b5f27d2a9fd9899d43cf128fe (diff) | |
| download | libinput-553092ea93edb9290b43954d7cf9610e7350d8c1.tar.gz | |
CI: make freebsd slightly more in line with others
the combination of want_qemu and skip_container is not very straight
forward.
What we actually have, is that freebsd is only qemu based, so there is
no point in really having a `_QEMU` tag for it.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e1082bec..59d7606b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -95,7 +95,6 @@ variables: ALPINE_TAG: '2022-06-10.0' FREEBSD_TAG: '2022-06-10.0' FEDORA_QEMU_TAG: 'fedora-qemu-vm-2022-06-10.0' - FREEBSD_QEMU_TAG: 'freebsd-qemu-vm-2022-06-10.0' FDO_UPSTREAM_REPO: libinput/libinput @@ -211,19 +210,6 @@ fedora:36@qemu-prep: FDO_DISTRIBUTION_TAG: $FEDORA_QEMU_TAG FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES -freebsd:13.0@qemu-prep: - extends: - - .fdo.qemu-build@freebsd - - .policy - stage: prep - tags: - - kvm - variables: - GIT_STRATEGY: none - FDO_DISTRIBUTION_VERSION: "13.0" - FDO_DISTRIBUTION_TAG: $FREEBSD_QEMU_TAG - FDO_DISTRIBUTION_PACKAGES: $FREEBSD_PACKAGES - fedora:35@container-prep: extends: @@ -291,6 +277,19 @@ alpine:latest@container-prep: FDO_DISTRIBUTION_PACKAGES: $ALPINE_PACKAGES FDO_DISTRIBUTION_TAG: $ALPINE_TAG +freebsd:13.0@container-prep: + extends: + - .fdo.qemu-build@freebsd + - .policy + tags: + - kvm + stage: prep + variables: + GIT_STRATEGY: none + FDO_DISTRIBUTION_VERSION: '13.0' + FDO_DISTRIBUTION_PACKAGES: $FREEBSD_PACKAGES + FDO_DISTRIBUTION_TAG: $FREEBSD_TAG + ################################################################# @@ -383,6 +382,16 @@ alpine:latest@container-clean: FDO_DISTRIBUTION_VERSION: 'latest' FDO_DISTRIBUTION_TAG: $ALPINE_TAG +freebsd:13.0@container-clean: + extends: + - .policy + - .container-clean + variables: + GIT_STRATEGY: none + CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/freebsd/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG + FDO_DISTRIBUTION_VERSION: '13.0' + FDO_DISTRIBUTION_TAG: $FREEBSD_TAG + ################################################################# # # @@ -964,11 +973,11 @@ freebsd:13.0@default-build: - .fdo.distribution-image@freebsd variables: FDO_DISTRIBUTION_VERSION: '13.0' - FDO_DISTRIBUTION_TAG: $FREEBSD_QEMU_TAG + FDO_DISTRIBUTION_TAG: $FREEBSD_TAG MESON_ARGS: '-Dtests=false -Ddocumentation=false' # doxygen drags down too many deps MESON_TEST_ARGS: '' # test suite doesn't work on BSD yet needs: - - "freebsd:13.0@qemu-prep" + - "freebsd:13.0@container-prep" ################################################################# |