Skip to content

Commit d6426ad

Browse files
committed
Fix checkout in Qt build script
1 parent 1c22940 commit d6426ad

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

.ci/build_qt6.sh

+7-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@ echo "Target architecture: ${target_arch} (${BUILD_ARCH_NAME})"
2424
# Clone Qt
2525
git clone https://github.com/qt/qt5 qt || exit 1
2626
cd qt
27-
git checkout $(git tag | grep '^v6\.8\.[0-9]*$' | sort -V | tail -n 1) || exit 1
27+
28+
if [[ `grep -o '\.' <<<"$qt_version" | grep -c .` == "1" ]]; then
29+
git checkout $(git tag | grep "^v${qt_version}.[0-9]*$" | sort -V | tail -n 1) || exit 1
30+
else
31+
git checkout "v${qt_version}"
32+
fi
33+
2834
./init-repository --module-subset=qtbase,qttools,qtdeclarative,qtsvg${qt_modules} || exit 1
2935

3036
# Build Qt (host)

0 commit comments

Comments
 (0)