xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 .gitlab-ci.yml |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit fede384962edd175b1a2ce6edd8d2ef9b0fd74f0
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Mon Feb 11 18:32:07 2019 +0100

    gitlab-ci: Don't rely on $CI_PROJECT_NAME
    
    The name of a forked repository can be changed later, in which case this
    would fail to refer to the main repository.
    
    Pointed out by Eric Engestrom in
    https://gitlab.freedesktop.org/mesa/mesa/merge_requests/224 .

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2ce64531..3c9e09920 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@
 variables:
     IMAGE_TAG: "debian-testing-20181217"
     IMAGE_LOCAL: "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
-    IMAGE_MAIN: "registry.freedesktop.org/xorg/$CI_PROJECT_NAME:$IMAGE_TAG"
+    IMAGE_MAIN: "registry.freedesktop.org/xorg/xserver:$IMAGE_TAG"
 
 stages:
     - docker-image
commit 8694395fcfd407190db74f31064960e484747377
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Feb 7 17:35:13 2019 +0100

    gitlab-ci: Only run docker-image stage if relevant source files change
    
    Otherwise there's normally no need to run it. It will also run when a
    new branch is created, which ensures that the docker image always exists
    (e.g. in a newly forked repository).
    
    Inspired by https://gitlab.freedesktop.org/mesa/mesa/merge_requests/143

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6d1ef5ff..d2ce64531 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,6 +23,10 @@ stages:
 
 debian-testing:
     stage: docker-image
+    only:
+        changes:
+            - .gitlab-ci.yml
+            - .gitlab-ci/Dockerfile
     image:
         name: gcr.io/kaniko-project/executor:debug
         entrypoint: [""]