diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-05-19 15:57:52 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2020-05-19 15:58:13 +1000 |
| commit | e8e5d1a6b579c6bd5e6c9e76a53f13ca77fa0d5f (patch) | |
| tree | bd33e2066ffc63a2cb34899c1529e79d01e6b9ba | |
| parent | 639b21d78a80566477163993366400e506f6e7b7 (diff) | |
gitlab CI: update to latest CI templates
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | .gitlab-ci.yml | 63 |
1 files changed, 27 insertions, 36 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc6d5c2..0397f91 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,42 +1,38 @@ # vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0: include: - - project: 'wayland/ci-templates' - ref: 955e61e67cf29327cf907432f668df9eec4ca6a2 # see https://docs.gitlab.com/ee/ci/yaml/#includefile + - project: 'freedesktop/ci-templates' + ref: 59de540b620c45739871d1a073d76d5521989d11 # see https://docs.gitlab.com/ee/ci/yaml/#includefile file: '/templates/fedora.yml' variables: - FEDORA_RPMS: 'git autoconf automake libtool make xorg-x11-server-devel libudev-devel libevdev-devel libinput-devel xorg-x11-util-macros' - FEDORA_TAG: '2020-05-19.0' - UPSTREAM_REPO: xorg/drivers/xf86-input-libinput - BUILDAH_IMAGE: $CI_REGISTRY/wayland/ci-templates/buildah:latest - FEDORA_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FEDORA_VERSION:$FEDORA_TAG + FDO_UPSTREAM_REPO: xorg/drivers/xf86-input-libinput stages: - - containers-build + - containers - build -container_build: - extends: .fedora@container-ifnot-exists - stage: containers-build +.fedora: variables: - GIT_STRATEGY: none - FEDORA_VERSION: 32 + FDO_DISTRIBUTION_VERSION: 32 + FDO_DISTRIBUTION_PACKAGES: 'git autoconf automake libtool make xorg-x11-server-devel libudev-devel libevdev-devel libinput-devel xorg-x11-util-macros' + FDO_DISTRIBUTION_TAG: '2020-05-19.0' -.default_artifacts: &default_artifacts - artifacts: - name: "automake-logs-$CI_JOB_NAME" - when: always - expire_in: 1 week - paths: - - _builddir/config.log +fedora@container_build: + extends: + - .fedora + - .fdo.container-build@fedora + stage: containers + variables: + GIT_STRATEGY: none -.default_build: &default_build +.default_build: + stage: build script: - mkdir _builddir _inst - pushd _builddir > /dev/null @@ -44,21 +40,16 @@ container_build: - make && make check - make install - popd > /dev/null - - -.build@template: - stage: build - <<: *default_artifacts - <<: *default_build - dependencies: [] - - -.fedora-build@template: - extends: .build@template - image: $FEDORA_CONTAINER_IMAGE + artifacts: + name: "automake-logs-$CI_JOB_NAME" + when: always + expire_in: 1 week + paths: + - _builddir/config.log fedora:32@default-build: - extends: .fedora-build@template - variables: - FEDORA_VERSION: 32 + extends: + - .fedora + - .fdo.distribution-image@fedora + - .default_build |