AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Require LLVM_VERSION to be set explicitly

Browse Source 
Stop falling back to 15 in random places; make sure it's set clearly
every time we want to use it.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33137>
This commit is contained in:
Daniel Stone
2024-10-24 11:28:54 +01:00
committed by Marge Bot
parent bb01f3ae6c
commit 55e9fe9d37
9 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci/container/build-skqp.sh
View File

@@ -68,8 +68,8 @@ cat "${SKQP_PATCH_DIR}"/build-skqp_*.patch |
# hack for skqp see the clang
pushd /usr/bin/
ln -s "../lib/llvm-${LLVM_VERSION:-15}/bin/clang" clang
ln -s "../lib/llvm-${LLVM_VERSION:-15}/bin/clang++" clang++
ln -s "../lib/llvm-${LLVM_VERSION}/bin/clang" clang
ln -s "../lib/llvm-${LLVM_VERSION}/bin/clang++" clang++
popd
# Fetch some needed build tools needed to build skia/skqp.

2
.gitlab-ci/container/cross_build.sh
View File

@@ -8,7 +8,7 @@ set -e
set -o xtrace
export DEBIAN_FRONTEND=noninteractive
export LLVM_VERSION="${LLVM_VERSION:=15}"
: "${LLVM_VERSION:?llvm version not set!}"
# Ephemeral packages (installed for this script and removed again at the end)
EPHEMERAL=(

2
.gitlab-ci/container/debian/arm64_build.sh
View File

@@ -7,7 +7,7 @@ set -e
set -o xtrace
export LLVM_VERSION="${LLVM_VERSION:=15}"
: "${LLVM_VERSION:?llvm version not set}"
apt-get -y install ca-certificates
sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.d/*

2
.gitlab-ci/container/debian/test-base.sh
View File

@@ -21,7 +21,7 @@ sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.d/*
echo "deb [trusted=yes] https://gitlab.freedesktop.org/gfx-ci/ci-deb-repo/-/raw/${PKG_REPO_REV}/ ${FDO_DISTRIBUTION_VERSION%-*} main" | tee /etc/apt/sources.list.d/gfx-ci_.list
export LLVM_VERSION="${LLVM_VERSION:=15}"
: "${LLVM_VERSION:?llvm version not set!}"
# Ephemeral packages (installed for this script and removed again at the end)
EPHEMERAL=(

2
.gitlab-ci/container/debian/test-gl.sh
View File

@@ -10,7 +10,7 @@ set -o xtrace
uncollapsed_section_start debian_setup "Base Debian system setup"
export DEBIAN_FRONTEND=noninteractive
export LLVM_VERSION="${LLVM_VERSION:=15}"
: "${LLVM_VERSION:?llvm version not set!}"
apt-get install -y libelogind0 # this interfere with systemd deps, install separately

2
.gitlab-ci/container/debian/x86_64_build-base.sh
View File

@@ -12,7 +12,7 @@ set -e
set -o xtrace
export DEBIAN_FRONTEND=noninteractive
export LLVM_VERSION="${LLVM_VERSION:=15}"
: "${LLVM_VERSION:?llvm version not set!}"
apt-get install -y ca-certificates
sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list.d/*

2
.gitlab-ci/container/debian/x86_64_build.sh
View File

@@ -12,7 +12,7 @@ set -e
set -o xtrace
export DEBIAN_FRONTEND=noninteractive
export LLVM_VERSION="${LLVM_VERSION:=15}"
: "${LLVM_VERSION:?llvm version not set!}"
# Ephemeral packages (installed for this script and removed again at the end)
EPHEMERAL=(

2
.gitlab-ci/container/lava_build.sh
View File

@@ -18,7 +18,7 @@ set -e
set -o xtrace
export DEBIAN_FRONTEND=noninteractive
export LLVM_VERSION="${LLVM_VERSION:=15}"
: "${LLVM_VERSION:?llvm version not set!}"
export FIRMWARE_FILES="${FIRMWARE_FILES}"
export SKIP_UPDATE_FLUSTER_VECTORS=0

16
.gitlab-ci/image-tags.yml
View File

@@ -13,10 +13,10 @@
variables:
DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
DEBIAN_BASE_TAG: "20250109-libubsan1"
DEBIAN_BASE_TAG: "20250128-llversionm1"
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
DEBIAN_BUILD_TAG: "20250124-android"
DEBIAN_BUILD_TAG: "20250128-llversionm1"
DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
DEBIAN_ARM64_TEST_BASE_IMAGE: "debian/arm64_test-base"
@@ -27,17 +27,17 @@ variables:
DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk"
DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
DEBIAN_TEST_ANDROID_TAG: "20250128-vkcts"
DEBIAN_TEST_GL_TAG: "20250127-vkcts-main"
DEBIAN_TEST_VK_TAG: "20250128-vkcts"
KERNEL_ROOTFS_TAG: "20250128-vkcts"
DEBIAN_TEST_ANDROID_TAG: "20250128-llversionm1"
DEBIAN_TEST_GL_TAG: "20250128-llversionm1"
DEBIAN_TEST_VK_TAG: "20250128-llversionm1"
KERNEL_ROOTFS_TAG: "20250128-llversionm1"
DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
DEBIAN_PYUTILS_TAG: "20241223-pyutils"
ALPINE_X86_64_BUILD_TAG: "20250124-spirv-tools"
ALPINE_X86_64_BUILD_TAG: "20250128-llversionm"
ALPINE_X86_64_LAVA_SSH_TAG: "20250124-spirv-tools"
FEDORA_X86_64_BUILD_TAG: "20250125-which"
FEDORA_X86_64_BUILD_TAG: "20250128-llversionm"
KERNEL_TAG: "v6.13-rc4-mesa-5e77"
KERNEL_REPO: "gfx-ci/linux"