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

ci: angle: fix depot-tools dependency release

Browse Source 
Cloning a dependency from the last commit in the main branch of a repo,
besides is not the usual practice here, is risky because it can fail without
relation with the activity in Mesa. In fact, it happens sporadically, that a
build fails from an error from depot-tools. So, start stabilizing that by
fixing the commit of depot-tools we use. Later we can face the uprev of this
dependency.

Signed-off-by: Sergi Blanch Torne <sergi.blanch.torne@collabora.com>
Reviewed-by: Vignesh Raman <vignesh.raman@collabora.com>
Reviewed-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34788>
This commit is contained in:
Sergi Blanch Torne
2025-05-01 17:00:27 +02:00
committed by Marge Bot
parent 6427e57e33
commit 27020be893
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/conditional-build-image-tags.yml
View File

@@ -1,3 +1,3 @@
variables:
CONDITIONAL_BUILD_ANGLE_TAG: be4f59328ef607bcbf5048a3f6f27410
CONDITIONAL_BUILD_ANGLE_TAG: 384145a4023315dae658259bee07c43a
CONDITIONAL_BUILD_PIGLIT_TAG: a19e424b8a3f020dbf1b9dd29f220a4f

9
.gitlab-ci/container/build-angle.sh
View File

@@ -14,6 +14,7 @@ section_start angle "Building ANGLE"
ci_tag_build_time_check "ANGLE_TAG"
ANGLE_REV="f355e2b37ed43939e2753fc7dacccf75abb4c1a3"
DEPOT_REV="5982a1aeb33dc36382ed8c62eddf52a6135e7dd3"
# Set ANGLE_ARCH based on DEBIAN_ARCH if it hasn't been explicitly defined
if [[ -z "${ANGLE_ARCH:-}" ]]; then
@@ -24,9 +25,15 @@ if [[ -z "${ANGLE_ARCH:-}" ]]; then
fi
# DEPOT tools
git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git /depot-tools
mkdir /depot-tools
pushd /depot-tools
git init
git remote add origin https://chromium.googlesource.com/chromium/tools/depot_tools.git
git fetch --depth 1 origin "$DEPOT_REV"
git checkout FETCH_HEAD
export PATH=/depot-tools:$PATH
export DEPOT_TOOLS_UPDATE=0
popd
mkdir /angle-build
mkdir /angle

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

@@ -23,8 +23,8 @@ variables:
DEBIAN_BUILD_TAG: "20250422-ci-fairy"
DEBIAN_TEST_ANDROID_TAG: "20250423-rootfs"
DEBIAN_TEST_GL_TAG: "20250423-rootfs"
DEBIAN_TEST_ANDROID_TAG: "20250502-depot-57"
DEBIAN_TEST_GL_TAG: "20250502-depot-57"
DEBIAN_TEST_VIDEO_TAG: "20250423-rootfs"
DEBIAN_TEST_VK_TAG: "20250423-rootfs"