pixman: Branch 'master'
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Jan 10 17:26:08 UTC 2025
.gitlab-ci.d/01-docker.yml | 4 ++--
.gitlab-ci.d/02-build.yml | 16 ++++++++--------
.gitlab-ci.d/03-test.yml | 16 ++++++++--------
.gitlab-ci.d/pixman-project.yml | 13 +------------
.gitlab-ci.d/templates/build.yml | 4 ++--
.gitlab-ci.d/templates/docker.yml | 2 +-
.gitlab-ci.d/templates/test.yml | 4 ++--
7 files changed, 24 insertions(+), 35 deletions(-)
New commits:
commit 707d7e34ca3d435b23ac3e7c05417fc0d39f4263
Author: Marek Pikuła <m.pikula at partner.samsung.com>
Date: Thu Jan 9 22:11:41 2025 +0100
ci: Fix runner tag variable expansion
It seems that GitLab doesn't allow expansion of variables provided with
template "inputs" if they are not defined as CI variable on project
level. This makes the default values saves in global `variable` section
unusable. That means that if a projects doesn't have the CI variables
defined, the CI won't run – this includes forks.
In order to prevent problematic setup for forks, the default runner tags
are hard-coded.
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 182cf2c..013b82b 100644
--- a/.gitlab-ci.d/01-docker.yml
+++ b/.gitlab-ci.d/01-docker.yml
@@ -7,7 +7,7 @@
include:
- local: .gitlab-ci.d/templates/docker.yml
inputs:
- runner_tag: $RUNNER_TAG_ARM
+ runner_tag: kvm-aarch64
targets:
- linux-arm-v5
- linux-arm-v7
@@ -15,7 +15,7 @@ include:
- windows-arm64-v8
- local: .gitlab-ci.d/templates/docker.yml
inputs:
- runner_tag: $RUNNER_TAG_DEFAULT
+ runner_tag: kvm
targets:
- linux-386
- linux-amd64
diff --git a/.gitlab-ci.d/02-build.yml b/.gitlab-ci.d/02-build.yml
index 75093f5..c6a7a9a 100644
--- a/.gitlab-ci.d/02-build.yml
+++ b/.gitlab-ci.d/02-build.yml
@@ -26,20 +26,20 @@ include:
qemu_cpu: arm1136
# Disable coverage, as the tests take too long to run with a single thread.
enable_gnu_coverage: false
- runner_tag: $RUNNER_TAG_ARM
- docker_job: docker:${RUNNER_TAG_ARM}
+ runner_tag: kvm-aarch64
+ docker_job: docker:kvm-aarch64
- local: .gitlab-ci.d/templates/build.yml
inputs:
target: linux-arm-v7
toolchain: [gnu] # TODO: https://gitlab.freedesktop.org/pixman/pixman/-/issues/113
qemu_cpu: max
- runner_tag: $RUNNER_TAG_ARM
- docker_job: docker:${RUNNER_TAG_ARM}
+ runner_tag: kvm-aarch64
+ docker_job: docker:kvm-aarch64
- local: .gitlab-ci.d/templates/build.yml
inputs:
target: linux-arm64-v8
- runner_tag: $RUNNER_TAG_ARM
- docker_job: docker:${RUNNER_TAG_ARM}
+ runner_tag: kvm-aarch64
+ docker_job: docker:kvm-aarch64
- local: .gitlab-ci.d/templates/build.yml
inputs:
target: linux-mips
@@ -88,5 +88,5 @@ include:
target: windows-arm64-v8
toolchain: [llvm] # GNU toolchain doesn't seem to support Windows on ARM.
enable_gnu_coverage: false
- runner_tag: $RUNNER_TAG_ARM
- docker_job: docker:${RUNNER_TAG_ARM}
+ runner_tag: kvm-aarch64
+ docker_job: docker:kvm-aarch64
diff --git a/.gitlab-ci.d/03-test.yml b/.gitlab-ci.d/03-test.yml
index 8310453..120c797 100644
--- a/.gitlab-ci.d/03-test.yml
+++ b/.gitlab-ci.d/03-test.yml
@@ -41,20 +41,20 @@ include:
pixman_disable: ["arm-neon"] # Test only arm-simd.
timeout: 3h
test_timeout_multiplier: 40
- runner_tag: $RUNNER_TAG_ARM
- docker_job: docker:${RUNNER_TAG_ARM}
+ runner_tag: kvm-aarch64
+ docker_job: docker:kvm-aarch64
- local: .gitlab-ci.d/templates/test.yml
inputs:
target: linux-arm-v7
toolchain: [gnu] # TODO: https://gitlab.freedesktop.org/pixman/pixman/-/issues/113
qemu_cpu: [max]
- runner_tag: $RUNNER_TAG_ARM
- docker_job: docker:${RUNNER_TAG_ARM}
+ runner_tag: kvm-aarch64
+ docker_job: docker:kvm-aarch64
- local: .gitlab-ci.d/templates/test.yml
inputs:
target: linux-arm64-v8
- runner_tag: $RUNNER_TAG_ARM
- docker_job: docker:${RUNNER_TAG_ARM}
+ runner_tag: kvm-aarch64
+ docker_job: docker:kvm-aarch64
- local: .gitlab-ci.d/templates/test.yml
inputs:
target: linux-mips
@@ -122,5 +122,5 @@ include:
inputs:
target: windows-arm64-v8
toolchain: [llvm]
- runner_tag: $RUNNER_TAG_ARM
- docker_job: docker:${RUNNER_TAG_ARM}
+ runner_tag: kvm-aarch64
+ docker_job: docker:kvm-aarch64
diff --git a/.gitlab-ci.d/pixman-project.yml b/.gitlab-ci.d/pixman-project.yml
index aaeecd5..a3fffba 100644
--- a/.gitlab-ci.d/pixman-project.yml
+++ b/.gitlab-ci.d/pixman-project.yml
@@ -1,11 +1,5 @@
# This file contains the set of jobs run by the pixman project:
# https://gitlab.freedesktop.org/pixman/pixman/-/pipelines
-#
-# Expected GitLab CI variables:
-# - RUNNER_TAG_DEFAULT – default GitLab CI runner tag. The `kvm` tag works on
-# FDO infrastructure.
-# - RUNNER_TAG_ARM – GitLab CI tag for ARM targets. Needs to have capability
-# to run both 32 and 64-bit ARM binaries.
stages:
- docker
@@ -14,11 +8,6 @@ stages:
- summary
variables:
- # Default values for variables which are supposed to be overridden in the form
- # of GitLab CI variables.
- RUNNER_TAG_DEFAULT: kvm
- RUNNER_TAG_ARM: kvm-aarch64
-
# Docker image global configuration.
DOCKER_TAG: latest
DOCKER_IMAGE_NAME: registry.freedesktop.org/pixman/pixman/pixman:${DOCKER_TAG}
@@ -58,7 +47,7 @@ workflow:
default:
tags:
- - $RUNNER_TAG_DEFAULT
+ - kvm
# Retry in case the runner is misconfigured for multi-arch builds or some
# random unexpected runner error occurs (it happened during testing).
diff --git a/.gitlab-ci.d/templates/build.yml b/.gitlab-ci.d/templates/build.yml
index 6633751..a471994 100644
--- a/.gitlab-ci.d/templates/build.yml
+++ b/.gitlab-ci.d/templates/build.yml
@@ -48,10 +48,10 @@ spec:
default: 1
runner_tag:
description: GitLab runner tag for this job.
- default: $RUNNER_TAG_DEFAULT
+ default: kvm
docker_job:
description: Docker image build job name.
- default: docker:${RUNNER_TAG_DEFAULT}
+ default: docker:kvm
---
"$[[ inputs.job_name_prefix ]]build:$[[ inputs.target ]]$[[ inputs.job_name_suffix ]]":
diff --git a/.gitlab-ci.d/templates/docker.yml b/.gitlab-ci.d/templates/docker.yml
index 9fb049a..d29941a 100644
--- a/.gitlab-ci.d/templates/docker.yml
+++ b/.gitlab-ci.d/templates/docker.yml
@@ -18,7 +18,7 @@ spec:
default: ""
runner_tag:
description: GitLab runner tag for this job.
- default: $RUNNER_TAG_DEFAULT
+ default: kvm
---
diff --git a/.gitlab-ci.d/templates/test.yml b/.gitlab-ci.d/templates/test.yml
index fab07dc..1be2d0e 100644
--- a/.gitlab-ci.d/templates/test.yml
+++ b/.gitlab-ci.d/templates/test.yml
@@ -68,10 +68,10 @@ spec:
default: 1
runner_tag:
description: GitLab runner tag for this job.
- default: $RUNNER_TAG_DEFAULT
+ default: kvm
docker_job:
description: Docker image build job name.
- default: docker:${RUNNER_TAG_DEFAULT}
+ default: docker:kvm
---
"$[[ inputs.job_name_prefix ]]test:$[[ inputs.target ]]$[[ inputs.job_name_suffix ]]":
More information about the xorg-commit
mailing list