From e45f2e6c467220017257fc5f9d935a2dd865c1cc Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Sat, 29 Mar 2025 17:16:46 +0100 Subject: [PATCH] ci: move aarch64 tag to .use-debian/arm64_build Like we do in the other `.use-debian/arm64_*`. Part-of: --- .gitlab-ci/build/gitlab-ci.yml | 2 -- .gitlab-ci/container/gitlab-ci.yml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 3517556d2a5..d953d0966f0 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -466,8 +466,6 @@ debian-android: VULKAN_DRIVERS: "asahi,broadcom,freedreno" GALLIUM_DRIVERS: "etnaviv,freedreno,lima,nouveau,panfrost,llvmpipe,softpipe,tegra,v3d,vc4,zink" BUILDTYPE: "debugoptimized" - tags: - - aarch64 debian-arm32: extends: diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index d31b74a5131..f1396222a8e 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -239,6 +239,8 @@ debian/arm64_build: .use-debian/arm64_build: extends: - .set-image + tags: + - aarch64 variables: MESA_IMAGE_PATH: "debian/arm64_build" MESA_IMAGE_TAG: *debian-arm64_build @@ -580,8 +582,6 @@ kernel+rootfs_arm64: - .kernel+rootfs - .firmware_arm64 - .container-builds-arm64 - tags: - - aarch64 variables: DEBIAN_ARCH: "arm64" LLVM_VERSION: *debian-arm64-llvm