summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorArun Raghavan <arun@arunraghavan.net>2020-03-07 07:14:00 -0500
committerArun Raghavan <arun@arunraghavan.net>2020-03-07 07:15:50 -0500
commit94e479b2614c8c46953ceb6cc4a37da3b898905c (patch)
tree6e3776170737fcc55eee6b32f70bda7041fc23c5 /.gitlab-ci.yml
parent04bf85cb74d7e538fd2954e2d44c91f71265a72e (diff)
downloadpulseaudio-94e479b2614c8c46953ceb6cc4a37da3b898905c.tar.gz
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.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml8
1 files changed, 6 insertions, 2 deletions
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: