From 9963b16aa2cf0bef3528ae7f6f128dcfbc3a2e9d Mon Sep 17 00:00:00 2001 From: Mike Gelfand Date: Sat, 5 Jul 2025 00:20:57 +0100 Subject: [PATCH] .github: hold xts at old master revision to fix Mac build While MRs to fix Mac build are in the process of being reviewed and merged upstream, hold xts at old master revision to avoid build failures. Once/if all upstream MRs are accepted, could revert this back to track master, or bump to a newer revision. Signed-off-by: Mike Gelfand --- .github/scripts/install-prereq.sh | 2 +- .github/scripts/util.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/scripts/install-prereq.sh b/.github/scripts/install-prereq.sh index 2bdbeb65a..98f1db5c6 100755 --- a/.github/scripts/install-prereq.sh +++ b/.github/scripts/install-prereq.sh @@ -26,7 +26,7 @@ fi if [ "$X11_OS" = "Darwin" ]; then build_ac xset https://gitlab.freedesktop.org/xorg/app/xset xset-1.2.5 fi -build_ac_xts xts https://gitlab.freedesktop.org/xorg/test/xts master # dbbfa96c036e596346147081cbceda136e7c86c1 +build_ac_xts xts https://gitlab.freedesktop.org/xorg/test/xts 12a887c2c72c4258962b56ced7b0aec782f1ffed # master @ 2025-02-11 clone_source piglit https://gitlab.freedesktop.org/mesa/piglit main # 265896c86f90cb72e8f218ba6a3617fca8b9a1e3 diff --git a/.github/scripts/util.sh b/.github/scripts/util.sh index cd74de195..669b7bb4f 100644 --- a/.github/scripts/util.sh +++ b/.github/scripts/util.sh @@ -8,7 +8,12 @@ clone_source() { if [ ! -f $pkgname/.git/config ]; then echo "need to clone $pkgname" - git clone $url $pkgname --branch=$ref --depth 1 + # Using multiple commands to support revisions in $ref + # TODO: Switch to `git clone --revision=$ref ...` when using Git 2.49+ + git init $pkgname + git -C $pkgname remote add origin $url + git -C $pkgname fetch origin $ref --depth 1 + git -C $pkgname checkout FETCH_HEAD else echo "already cloned $pkgname" fi