diff options
| author | Alex Richardson <Alexander.Richardson@cl.cam.ac.uk> | 2021-08-27 10:03:56 +0100 |
|---|---|---|
| committer | Alexander Richardson <alexander.richardson@cl.cam.ac.uk> | 2021-09-10 11:35:54 +0000 |
| commit | 3288a076ebc2bee1b5c16d51d62bd1371ca30387 (patch) | |
| tree | 54b9c7b5c8b2d8a87d3716ee8a50788ececa5a43 /.gitlab-ci.yml | |
| parent | gitlab-ci: update ci-templates to the latest commit (diff) | |
| download | wayland-3288a076ebc2bee1b5c16d51d62bd1371ca30387.tar wayland-3288a076ebc2bee1b5c16d51d62bd1371ca30387.tar.gz wayland-3288a076ebc2bee1b5c16d51d62bd1371ca30387.tar.bz2 wayland-3288a076ebc2bee1b5c16d51d62bd1371ca30387.tar.lz wayland-3288a076ebc2bee1b5c16d51d62bd1371ca30387.tar.xz wayland-3288a076ebc2bee1b5c16d51d62bd1371ca30387.tar.zst wayland-3288a076ebc2bee1b5c16d51d62bd1371ca30387.zip | |
gitlab-ci: remove duplicated lines in ci-templates include
The file key can have multiple values, so we don't need another "project".
Signed-off-by: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a59dc76..f40674d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,14 +44,11 @@ .templates_sha: &template_sha 567700e483aabed992d0a4fea84994a0472deff6 # see https://docs.gitlab.com/ee/ci/yaml/#includefile include: - # Debian container builder template - project: 'freedesktop/ci-templates' ref: *template_sha - file: '/templates/debian.yml' - # ci-fairy template - - project: 'freedesktop/ci-templates' - ref: *template_sha - file: '/templates/ci-fairy.yml' + file: + - '/templates/debian.yml' + - '/templates/ci-fairy.yml' variables: FDO_UPSTREAM_REPO: wayland/wayland |