diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2021-03-26 15:44:37 +0100 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2021-03-26 15:50:36 +0100 |
| commit | 1e52414765a342ed7e872927313de14906c84b8e (patch) | |
| tree | d0d8d4648a708ea9010dd111518f4e41be54a724 | |
| parent | 5cb6b92f0111d91f68eb268ad025cab783d25f14 (diff) | |
ci: Switch to upstream ci-templates and use Debian bullseye
This switches to the ci-templates that is found on
https://gitlab.freedesktop.org/freedesktop/ci-templates/
While at it, switch to Debian bullseye, as this contains more reasonably
versioned build tools, i.e. a new enough version of meson.
Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
| -rw-r--r-- | .gitlab-ci.yml | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 66a56a3..fb8b59f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,27 +1,33 @@ -variables: - DEBIAN_TAG: 2019-11-21.0 - DEBIAN_VERSION: stable - TEST_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG" include: - - project: 'wayland/ci-templates' - ref: f69acac60d5dde0410124fd5674764600821b7a6 + - project: 'freedesktop/ci-templates' + ref: 59de540b620c45739871d1a073d76d5521989d11 file: '/templates/debian.yml' stages: - containers-build - test +.debian: + variables: + FDO_UPSTREAM_REPO: wayland/wayland-protocols + FDO_DISTRIBUTION_VERSION: bullseye + FDO_DISTRIBUTION_PACKAGES: 'build-essential automake autoconf libtool pkg-config libwayland-dev meson' + FDO_DISTRIBUTION_TAG: '2021-03-24.0' + container_build: - extends: .debian@container-ifnot-exists + extends: + - .debian + - .fdo.container-build@debian stage: containers-build variables: - GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image - DEBIAN_DEBS: 'build-essential automake autoconf libtool pkg-config libwayland-dev' + GIT_STRATEGY: none test: stage: test - image: $TEST_IMAGE + extends: + - .debian + - .fdo.distribution-image@debian script: - ./autogen.sh - make check |