Mesa (master): gitlab-ci: Document that ci-templates refs must be in sync

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Nov 15 16:00:22 UTC 2019


Module: Mesa
Branch: master
Commit: 670277846dcf6ed3e80c0c6037a23c4d34ff558d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=670277846dcf6ed3e80c0c6037a23c4d34ff558d

Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Thu Nov  7 20:25:10 2019 +0100

gitlab-ci: Document that ci-templates refs must be in sync

Otherwise there can be weird breakage.

(Removing the include from .gitlab-ci/lava-gitlab-ci.yml doesn't seem
possible unfortunately:
https://gitlab.freedesktop.org/daenzer/mesa/pipelines/79458)

Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>

---

 .gitlab-ci.yml                | 1 +
 .gitlab-ci/lava-gitlab-ci.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8646f79718..11189135e6d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,6 +29,7 @@ variables:
 
 include:
   - project: 'wayland/ci-templates'
+    # Must be the same as in .gitlab-ci/lava-gitlab-ci.yml
     ref: 1f7f57c64ff4ebbf7292e3b7a13600518b8cb24c
     file: '/templates/debian.yml'
 
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index e9b324b60c4..342e7f07750 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -4,6 +4,7 @@ variables:
 
 include:
   - project: 'wayland/ci-templates'
+    # Must be the same as in .gitlab-ci.yml
     ref: 1f7f57c64ff4ebbf7292e3b7a13600518b8cb24c
     file: '/templates/debian.yml'
 




More information about the mesa-commit mailing list