Skip to content

Commit 381d701

Browse files
committed
ci: Only test against one of two musl versions
Commonize to always build 1.2.5 for tests that require a newer musl, rather than either 1.2.3 or 1.2.5 based on the version. (backport <#4788>) (cherry picked from commit 03e32e8)
1 parent d69581d commit 381d701

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

ci/install-musl.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@
55

66
set -eux
77

8+
old_musl=1.1.24
9+
new_musl=1.2.5
10+
811
case ${1} in
9-
loongarch64)
10-
musl_version=1.2.5
11-
;;
12+
loongarch64) musl_version="$new_musl" ;;
1213
*)
13-
[ -n "${RUST_LIBC_UNSTABLE_MUSL_V1_2_3:-}" ] && musl_version=1.2.3 || musl_version=1.1.24
14+
[ -n "${RUST_LIBC_UNSTABLE_MUSL_V1_2_3:-}" ] &&
15+
musl_version="$new_musl" ||
16+
musl_version="$old_musl"
1417
;;
1518
esac
1619

0 commit comments

Comments
 (0)