pixman: Branch 'master'

[GitLab Mirror]

 .gitlab-ci.d/01-docker.yml      |    1 +
 .gitlab-ci.d/pixman-project.yml |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b7ac7cd12267238d4ee11cd4c4fa91cd3fabdeaa
Author: Marek Pikuła <m.pikula at partner.samsung.com>
Date:   Wed Sep 25 20:20:08 2024 +0200

    ci: Fix Docker image source for MRs
    
    If the MR doesn't modify the Docker context, the pipeline should use the
    image from upstream.
    
    Signed-off-by: Marek Pikuła <m.pikula at partner.samsung.com>

diff --git a/.gitlab-ci.d/01-docker.yml b/.gitlab-ci.d/01-docker.yml
index 12ff8f6..7acae4c 100644
--- a/.gitlab-ci.d/01-docker.yml
+++ b/.gitlab-ci.d/01-docker.yml
@@ -15,6 +15,7 @@ docker:
           - .gitlab-ci.d/01-docker/**/*
       variables:
         DOCKER_TAG: $CI_COMMIT_REF_SLUG
+        DOCKER_IMAGE_NAME: ${CI_REGISTRY_IMAGE}/pixman:${DOCKER_TAG}
     - if: $CI_PIPELINE_SOURCE == 'schedule' && "$TARGET =~ $ACTIVE_TARGET_PATTERN"
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && "$TARGET =~ $ACTIVE_TARGET_PATTERN"
     - if: $CI_COMMIT_TAG && "$TARGET =~ $ACTIVE_TARGET_PATTERN"
diff --git a/.gitlab-ci.d/pixman-project.yml b/.gitlab-ci.d/pixman-project.yml
index 33a38b4..d0ecb1e 100644
--- a/.gitlab-ci.d/pixman-project.yml
+++ b/.gitlab-ci.d/pixman-project.yml
@@ -14,7 +14,7 @@ variables:
 
   # Docker image global configuration.
   DOCKER_TAG: latest
-  DOCKER_IMAGE_NAME: ${CI_REGISTRY_IMAGE}/pixman:${DOCKER_TAG}
+  DOCKER_IMAGE_NAME: registry.freedesktop.org/pixman/pixman/pixman:${DOCKER_TAG}
 
   # Execute to load a target-specific environment.
   LOAD_TARGET_ENV: source .gitlab-ci.d/01-docker/target-env/${TARGET}.env
@@ -33,6 +33,7 @@ workflow:
           - .gitlab-ci.d/01-docker/**/*
       variables:
         DOCKER_TAG: $CI_COMMIT_REF_SLUG
+        DOCKER_IMAGE_NAME: ${CI_REGISTRY_IMAGE}/pixman:${DOCKER_TAG}
 
     # A standard set of GitLab CI triggers (i.e., MR, schedule, default branch,
     # and tag).