xserver: Branch 'master'

[GitLab Mirror]

 .gitlab-ci.yml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 552250901fbe1a1f14826b7a959103b5894e27d5
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Jul 14 11:53:55 2024 -0700

    CI: Checkout driver tag into the directory we build from
    
    It was previously checking out the default branch into the $DRIVER
    subdirectory, and the requested tag into the current subdirectory,
    but then proceeding to build the $DRIVER subdirectory.
    
    Fixes: 89b7f4501 ("CI: add a driver build stage to check for header breakage")
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1607>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e2ca40f4..cc5f6c553 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -200,7 +200,7 @@ xf86-driver-build-test:
         - unset MESON_EXTRA_ARGS
         - DRIVER=$(basename $REPO)
         - git clone "$REPO" "$DRIVER"
-        - GIT_DIR="$DRIVER/.git" git checkout -f "$SHA"
+        - git -C "$DRIVER" checkout "$SHA"
         - |
           if [[ -e "$DRIVER/meson.build" ]]; then
             .gitlab-ci/meson-build.sh -C "$DRIVER" --skip-test