fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 06:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci/deqp: make sure the main commit is actually from the main branch

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32250>
This commit is contained in:
Eric Engestrom 2024-11-21 11:57:15 +01:00 • committed by Marge Bot
parent 84e855953c
commit 1b973278bd
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci/container/build-deqp.sh
View file

@ -107,6 +107,14 @@ git fetch --depth 1 origin "$DEQP_VERSION"
git checkout FETCH_HEAD
DEQP_COMMIT=$(git rev-parse FETCH_HEAD)
if [ "$DEQP_VERSION" = "$DEQP_MAIN_COMMIT" ]; then
git fetch origin main
if ! git merge-base --is-ancestor "$DEQP_MAIN_COMMIT" origin/main; then
echo "VK-GL-CTS commit $DEQP_MAIN_COMMIT is not a commit from the main branch."
exit 1
fi
fi
mkdir -p /deqp
if [ "$DEQP_API" = tools ]; then