From 94e479b2614c8c46953ceb6cc4a37da3b898905c Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Sat, 7 Mar 2020 07:14:00 -0500 Subject: ci: Go back to using CI templates from master Consensus is that we prefer this to potentially remaining on older, commits and manually updating at unknown frequency. --- .gitlab-ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e8ef6aa0f..a61110325 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,14 +18,18 @@ variables: # Update this tag when you want to trigger a rebuild the container in which # CI runs, for example when adding new packages to UBUNTU_DEBS. The tag is # an arbitrary string that identifies the exact container contents. - FDO_DISTRIBUTION_TAG: '2020-03-06-01' + FDO_DISTRIBUTION_TAG: '2020-03-07-01' FDO_DISTRIBUTION_VERSION: '18.04' FDO_UPSTREAM_REPO: 'pulseaudio/pulseaudio' UBUNTU_IMAGE: "$CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG" include: + # We pull templates from master to avoid the overhead of periodically + # scanning for changes upstream. This does means builds might occasionally + # break due to upstream changing things, so if you see unexpected build + # failures, this might be one cause. - project: 'wayland/ci-templates' - ref: 'df52af2195b052325daf5d715c88be90f8ec7d86' + ref: 'master' file: '/templates/ubuntu.yml' build-container: -- cgit v1.2.1