diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3dc25db..6645123 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ # vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0: -.templates_sha: &template_sha d303fafa66bbca44cc5bdb337d5773b5f019b70d # see https://docs.gitlab.com/ee/ci/yaml/#includefile +.templates_sha: &template_sha 290b79e0e78eab67a83766f4e9691be554fc4afd # see https://docs.gitlab.com/ee/ci/yaml/#includefile include: @@ -8,6 +8,9 @@ include: - project: 'freedesktop/ci-templates' ref: *template_sha file: '/templates/arch.yml' + - project: 'freedesktop/ci-templates' + ref: *template_sha + file: '/templates/ci-fairy.yml' # global variables to be used by most/all jobs. @@ -23,7 +26,7 @@ variables: # Changing the tag will rebuild the container images. The value is just a # string, but we use the date for human benefits. - FDO_DISTRIBUTION_TAG: '2021-04-16.0' + FDO_DISTRIBUTION_TAG: '2021-05-20.0' stages: @@ -83,11 +86,9 @@ container-prep: # check-merge-request: - image: golang:alpine + extends: + - .fdo.ci-fairy stage: gitlab - before_script: - - apk add python3 py-pip git - - pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates script: - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml artifacts: |