pixman: Branch 'master'

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Sep 26 21:27:59 UTC 2024


 .gitlab-ci.d/01-docker.yml |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 76b133f29369fa53116916cfdc95323207a7debf
Author: Marek Pikuła <m.pikula at partner.samsung.com>
Date:   Thu Sep 26 19:51:32 2024 +0200

    ci: Fix active target rule for Docker stage
    
    If rule condition for selectively running Docker image builds was ill
    formed. It resulted in build of all images even when not all targets
    were selected with ACTIVE_TARGET_PATTERN variable.

diff --git a/.gitlab-ci.d/01-docker.yml b/.gitlab-ci.d/01-docker.yml
index 7acae4c..aff3085 100644
--- a/.gitlab-ci.d/01-docker.yml
+++ b/.gitlab-ci.d/01-docker.yml
@@ -8,7 +8,7 @@ docker:
   stage: docker
   image: quay.io/buildah/stable
   rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && "$TARGET =~ $ACTIVE_TARGET_PATTERN"
+    - if: "$CI_PIPELINE_SOURCE == 'merge_request_event' && $TARGET =~ $ACTIVE_TARGET_PATTERN"
       changes:
         paths:
           - .gitlab-ci.d/01-docker.yml
@@ -16,9 +16,9 @@ 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"
+    - 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"
 
   variables:
     # Use vfs with buildah. Docker offers overlayfs as a default, but Buildah


More information about the xorg-commit mailing list