@@ -118,11 +118,11 @@ on:
118118 android_sdk_triple :
119119 type : string
120120 description : " The triple to use when building with the Swift SDK for Android"
121- default : " x86_64-unknown-linux-android28"
121+ default : " [ \" x86_64-unknown-linux-android28\" ] "
122122 android_ndk_version :
123123 type : string
124124 description : " The NDK version to use when building with the Swift SDK for Android"
125- default : " r27d"
125+ default : " [ \" r27d\" ] "
126126 windows_pre_build_command :
127127 type : string
128128 description : " Windows Command Prompt command to execute before building the Swift package"
@@ -444,6 +444,8 @@ jobs:
444444 fail-fast : false
445445 matrix :
446446 swift_version : ${{ fromJson(inputs.android_sdk_versions) }}
447+ sdk_triple : ${{ fromJson(inputs.android_sdk_triple) }}
448+ ndk_version : ${{ fromJson(inputs.android_ndk_version) }}
447449 os_version : ${{ fromJson(inputs.linux_os_versions) }}
448450 exclude :
449451 - ${{ fromJson(inputs.android_exclude_swift_versions) }}
@@ -490,8 +492,10 @@ jobs:
490492 echo "Unknown package manager (tried apt-get, dnf, yum)" >&2
491493 exit 1
492494 fi
493- curl -s --retry 3 https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/install-and-build-with-sdk.sh | \
494- bash -s -- --android --flags="$BUILD_FLAGS" --build-command="${{ inputs.android_sdk_build_command }}" --android-sdk-triple="${{ inputs.android_sdk_triple }}" --android-ndk-version="${{ inputs.android_ndk_version }}" ${{ matrix.swift_version }}
495+ # TODO: restore
496+ #curl -s --retry 3 https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/install-and-build-with-sdk.sh | \
497+ curl -s --retry 3 https://raw.githubusercontent.com/swift-android-sdk/github-workflows/refs/heads/android-workflow/.github/workflows/scripts/install-and-build-with-sdk.sh | \
498+ bash -s -- --android --flags="$BUILD_FLAGS" --build-command="${{ inputs.android_sdk_build_command }}" --android-sdk-triple="${{ inputs.sdk_triple }}" --android-ndk-version="${{ inputs.ndk_version }}" ${{ matrix.swift_version }}
495499
496500 windows-build :
497501 name : Windows (${{ matrix.swift_version }} - windows-2022)
0 commit comments