summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@gmail.com>2019-10-04 15:03:50 -0400
committerPeter Hutterer <peter.hutterer@who-t.net>2019-10-16 13:38:37 +1000
commit6dc9de071e99ffe93b3938721324bba178d8fc2f (patch)
treed550ea78a6508a0d6eae5c18b4f18683c26b64db
parentfa104590823210ba926918711da77fed3b31a08a (diff)
downloadlibinput-6dc9de071e99ffe93b3938721324bba178d8fc2f.tar.gz
gitlab-ci: use one sha1 instead of duplicates
because we can Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> (cherry picked from commit 779ce028c3d465a5209696f6a9b7aa14e2904b0d)
-rw-r--r--.gitlab-ci.yml10
1 files changed, 6 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e5bbf50..59efdb25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,18 +24,20 @@
# <distribution>:<version>@activity:
# e.g. fedora:29@build-default
+.templates_sha: &template_sha ff90ddcf059bfce35bd5f9b89a59d5d0c912b458 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+
include:
# Arch container builder template
- project: 'wayland/ci-templates'
- ref: ff90ddcf059bfce35bd5f9b89a59d5d0c912b458 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+ ref: *template_sha
file: '/templates/arch.yml'
# Fedora container builder template
- project: 'wayland/ci-templates'
- ref: ff90ddcf059bfce35bd5f9b89a59d5d0c912b458 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+ ref: *template_sha
file: '/templates/fedora.yml'
# Ubuntu container builder template
- project: 'wayland/ci-templates'
- ref: ff90ddcf059bfce35bd5f9b89a59d5d0c912b458 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+ ref: *template_sha
file: '/templates/ubuntu.yml'
stages:
@@ -71,7 +73,7 @@ variables:
UBUNTU_TAG: '2019-08-07.0'
ARCH_TAG: '2019-08-07.0'
FREEBSD_TAG: '2019-08-07.0'
- QEMU_TAG: 'qemu-vm-2019-08-06.1'
+ QEMU_TAG: 'qemu-vm-2019-10-04.0'
UBUNTU_EXEC: "bash .gitlab-ci/ubuntu_install.sh $UBUNTU_CUSTOM_DEBS"