fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-09 03:38:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab CI: use the CI-fairy image

Browse source 
This removes the need to pull a docker image for each of those stages.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-11-23 13:13:09 +10:00
parent dd47530932
commit b7df846a8b
2 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
.gitlab-ci.yml
View file

@ -30,7 +30,7 @@
# <distribution>:<version>@activity: # <distribution>:<version>@activity:
# e.g. fedora:31@build-default # e.g. fedora:31@build-default
.templates_sha: &template_sha 4f06663cd1507136a0f8440925a2521098adb298 # see https://docs.gitlab.com/ee/ci/yaml/#includefile .templates_sha: &template_sha 16f790f93f893394b70d7048fb0e8a981ceaa3c5 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
include: include:
# Alpine container builder template # Alpine container builder template
@ -53,6 +53,9 @@ include:
- project: 'freedesktop/ci-templates' - project: 'freedesktop/ci-templates'
ref: *template_sha ref: *template_sha
file: '/templates/ubuntu.yml' file: '/templates/ubuntu.yml'
- project: 'freedesktop/ci-templates'
ref: *template_sha
file: '/templates/ci-fairy.yml'
stages: stages:
- prep # prep work like rebuilding the container images if there is a change - prep # prep work like rebuilding the container images if there is a change
@ -127,12 +130,6 @@ variables:
junit: $MESON_BUILDDIR/junit-*.xml junit: $MESON_BUILDDIR/junit-*.xml
.ci_fairy_image:
image: python:alpine
before_script:
- apk add git
- pip install git+http://gitlab.freedesktop.org/freedesktop/ci-templates
################################################################# #################################################################
# # # #
# prep stage # # prep stage #
@ -145,7 +142,7 @@ variables:
# #
check-ci-script: check-ci-script:
extends: extends:
- .ci_fairy_image - .fdo.ci-fairy
stage: prep stage: prep
script: script:
- ci-fairy generate-template - ci-fairy generate-template
@ -159,7 +156,7 @@ check-ci-script:
check-commit: check-commit:
extends: extends:
- .ci_fairy_image - .fdo.ci-fairy
stage: prep stage: prep
script: script:
- ci-fairy check-commits --signed-off-by --junit-xml=results.xml - ci-fairy check-commits --signed-off-by --junit-xml=results.xml
@ -177,7 +174,7 @@ check-commit:
check-merge-request: check-merge-request:
extends: extends:
- .ci_fairy_image - .fdo.ci-fairy
stage: deploy stage: deploy
script: script:
- ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
@ -350,7 +347,7 @@ freebsd:11.2@container-prep:
.container-clean: .container-clean:
extends: extends:
- .policy - .policy
- .ci_fairy_image - .fdo.ci-fairy
stage: container_clean stage: container_clean
script: script:
# Go to your Profile, Settings, Access Tokens # Go to your Profile, Settings, Access Tokens

19
.gitlab-ci/ci.template
View file

@ -32,7 +32,7 @@
# <distribution>:<version>@activity: # <distribution>:<version>@activity:
# e.g. fedora:31@build-default # e.g. fedora:31@build-default
.templates_sha: &template_sha 4f06663cd1507136a0f8440925a2521098adb298 # see https://docs.gitlab.com/ee/ci/yaml/#includefile .templates_sha: &template_sha 16f790f93f893394b70d7048fb0e8a981ceaa3c5 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
include: include:
{% for distro in distributions|sort(attribute="name") %} {% for distro in distributions|sort(attribute="name") %}
@ -43,6 +43,9 @@ include:
file: '/templates/{{distro.name}}.yml' file: '/templates/{{distro.name}}.yml'
{% endif %} {% endif %}
{% endfor %} {% endfor %}
- project: 'freedesktop/ci-templates'
ref: *template_sha
file: '/templates/ci-fairy.yml'
stages: stages:
- prep # prep work like rebuilding the container images if there is a change - prep # prep work like rebuilding the container images if there is a change
@ -115,12 +118,6 @@ variables:
junit: $MESON_BUILDDIR/junit-*.xml junit: $MESON_BUILDDIR/junit-*.xml
.ci_fairy_image:
image: python:alpine
before_script:
- apk add git
- pip install git+http://gitlab.freedesktop.org/freedesktop/ci-templates
################################################################# #################################################################
# # # #
# prep stage # # prep stage #
@ -133,7 +130,7 @@ variables:
# #
check-ci-script: check-ci-script:
extends: extends:
- .ci_fairy_image - .fdo.ci-fairy
stage: prep stage: prep
script: script:
- ci-fairy generate-template - ci-fairy generate-template
@ -147,7 +144,7 @@ check-ci-script:
check-commit: check-commit:
extends: extends:
- .ci_fairy_image - .fdo.ci-fairy
stage: prep stage: prep
script: script:
- ci-fairy check-commits --signed-off-by --junit-xml=results.xml - ci-fairy check-commits --signed-off-by --junit-xml=results.xml
@ -165,7 +162,7 @@ check-commit:
check-merge-request: check-merge-request:
extends: extends:
- .ci_fairy_image - .fdo.ci-fairy
stage: deploy stage: deploy
script: script:
- ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
@ -280,7 +277,7 @@ freebsd:11.2@container-prep:
.container-clean: .container-clean:
extends: extends:
- .policy - .policy
- .ci_fairy_image - .fdo.ci-fairy
stage: container_clean stage: container_clean
script: script:
# Go to your Profile, Settings, Access Tokens # Go to your Profile, Settings, Access Tokens