From 86235b216345537d2cbeecf6d407ef425d40af5d Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Wed, 25 Mar 2026 00:47:33 -0400 Subject: [PATCH 1/5] Update android_sdk_versions to include 6.3 --- .github/workflows/swift_package_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift_package_test.yml b/.github/workflows/swift_package_test.yml index e1eb1c32..74bf12b5 100644 --- a/.github/workflows/swift_package_test.yml +++ b/.github/workflows/swift_package_test.yml @@ -73,7 +73,7 @@ on: android_sdk_versions: type: string description: "Android Swift SDK version list (JSON)" - default: "[\"nightly-main\", \"nightly-6.3\"]" + default: "[\"nightly-main\", \"nightly-6.3\", \"6.3\"]" android_exclude_swift_versions: type: string description: "Exclude Android Swift SDK version list (JSON)" From 93773ab13a61c8ab3ba61364251b334e4485ae1c Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Wed, 25 Mar 2026 01:30:55 -0400 Subject: [PATCH 2/5] Fix selector for android-sdk in releases.json --- .github/workflows/scripts/install-and-build-with-sdk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scripts/install-and-build-with-sdk.sh b/.github/workflows/scripts/install-and-build-with-sdk.sh index fa1176ab..ccb3503d 100755 --- a/.github/workflows/scripts/install-and-build-with-sdk.sh +++ b/.github/workflows/scripts/install-and-build-with-sdk.sh @@ -233,7 +233,7 @@ find_latest_swift_version() { .[] | select(.name == $version) | .platforms[] - | select(.platform == "android") + | select(.platform == "android-sdk") | .checksum ') From 49199a9e6418ab67f1aeebbd6d7511cd76d2ea38 Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Wed, 25 Mar 2026 01:41:49 -0400 Subject: [PATCH 3/5] Update comment --- .github/workflows/scripts/install-and-build-with-sdk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scripts/install-and-build-with-sdk.sh b/.github/workflows/scripts/install-and-build-with-sdk.sh index ccb3503d..e18b6451 100755 --- a/.github/workflows/scripts/install-and-build-with-sdk.sh +++ b/.github/workflows/scripts/install-and-build-with-sdk.sh @@ -199,7 +199,7 @@ command -v jq >/dev/null || install_package jq SWIFT_API_INSTALL_ROOT="https://www.swift.org/api/v1/install" # Transforms a minor Swift release version into its latest patch version -# and gets the checksum for the patch version's Static Linux and/or Wasm Swift SDK. +# and gets the checksum for the patch version's Android, Static Linux, or Wasm Swift SDK. # # $1 (string): A minor Swift version, e.g. "6.1" # Output: A string of the form "|||| From 86cfc46ad41fb9bee1d7adedb908f22c701f0e67 Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Wed, 25 Mar 2026 01:45:03 -0400 Subject: [PATCH 4/5] Add debugging output --- .github/workflows/scripts/install-and-build-with-sdk.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/scripts/install-and-build-with-sdk.sh b/.github/workflows/scripts/install-and-build-with-sdk.sh index e18b6451..c34b3f7b 100755 --- a/.github/workflows/scripts/install-and-build-with-sdk.sh +++ b/.github/workflows/scripts/install-and-build-with-sdk.sh @@ -229,6 +229,14 @@ find_latest_swift_version() { local android_sdk_checksum="" if [[ "$INSTALL_ANDROID" == true ]]; then + log "Android Swift SDK releases_json: ${releases_json}" + echo "$releases_json" | jq -r --arg version "$latest_version" ' + .[] + | select(.name == $version) + | .platforms[] + | select(.platform == "android-sdk") + ' + android_sdk_checksum=$(echo "$releases_json" | jq -r --arg version "$latest_version" ' .[] | select(.name == $version) From 260fb393acf9f7976bc6226f0cb7355cb563d275 Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Wed, 25 Mar 2026 01:52:57 -0400 Subject: [PATCH 5/5] Remove debugging output --- .github/workflows/scripts/install-and-build-with-sdk.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/scripts/install-and-build-with-sdk.sh b/.github/workflows/scripts/install-and-build-with-sdk.sh index c34b3f7b..e18b6451 100755 --- a/.github/workflows/scripts/install-and-build-with-sdk.sh +++ b/.github/workflows/scripts/install-and-build-with-sdk.sh @@ -229,14 +229,6 @@ find_latest_swift_version() { local android_sdk_checksum="" if [[ "$INSTALL_ANDROID" == true ]]; then - log "Android Swift SDK releases_json: ${releases_json}" - echo "$releases_json" | jq -r --arg version "$latest_version" ' - .[] - | select(.name == $version) - | .platforms[] - | select(.platform == "android-sdk") - ' - android_sdk_checksum=$(echo "$releases_json" | jq -r --arg version "$latest_version" ' .[] | select(.name == $version)