Skip to content

Commit a469e85

Browse files
committed
Simplify toolchain-vars.sh
1 parent afb2918 commit a469e85

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

swift-ci/sdks/android/scripts/toolchain-vars.sh

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,16 @@ OS=$(echo $HOST_OS | tr -d '.')
1717
case "${BUILD_SCHEME}" in
1818
release)
1919
# e.g., "swift-6.1-RELEASE"
20-
SWIFT_TAG=$(curl -fsSL https://www.swift.org/api/v1/install/releases.json | jq -r '.[-1].tag')
20+
# there is no latest-build.yml for releases, so we need to get it from the API
21+
export SWIFT_TAG=$(curl -fsSL https://www.swift.org/api/v1/install/releases.json | jq -r '.[-1].tag')
2122
# e.g., "swift-6.1-release"
22-
SWIFT_BRANCH=$(echo "${SWIFT_TAG}" | tr '[A-Z]' '[a-z]')
23+
export SWIFT_BRANCH=$(echo "${SWIFT_TAG}" | tr '[A-Z]' '[a-z]')
2324
;;
24-
swift-*-branch)
25+
development|swift-*-branch)
2526
# e.g., swift-6.2-DEVELOPMENT-SNAPSHOT-2025-05-15-a
26-
SWIFT_TAG=$(curl -fsSL https://download.swift.org/$BUILD_SCHEME/$OS/latest-build.yml | grep '^dir: ' | cut -f 2 -d ' ')
27-
SWIFT_BRANCH=$BUILD_SCHEME
28-
;;
29-
development)
3027
# e.g., swift-DEVELOPMENT-SNAPSHOT-2025-05-14-a
31-
SWIFT_TAG=$(curl -fsSL https://download.swift.org/development/$OS/latest-build.yml | grep '^dir: ' | cut -f 2 -d ' ')
32-
SWIFT_BRANCH="development"
28+
export SWIFT_TAG=$(curl -fsSL https://download.swift.org/$BUILD_SCHEME/$OS/latest-build.yml | grep '^dir: ' | cut -f 2 -d ' ')
29+
export SWIFT_BRANCH=$BUILD_SCHEME
3330
;;
3431
*)
3532
echo "$0: invalid BUILD_SCHEME=${BUILD_SCHEME}"

0 commit comments

Comments
 (0)