Skip to content

Commit b2b2b25

Browse files
Update Android SDK build name to include NDK version (#175)
* Update Android SDK build name to include NDK version This allows differentiating them when multiple NDKs are used. As far as multiple triples, I think those should be handled within the workflow, rather than splitting off into new matrix entries (especially as we already have some multi-triple build capabilities in swiftpm for macOS now and could conceivably extend that to Android), but that's for another PR. * Fix variable reference in Android build script
1 parent 2fe9a61 commit b2b2b25

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/swift_package_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ jobs:
504504
bash -s -- --embedded-wasm --flags="$BUILD_FLAGS" ${{ matrix.swift_version }}
505505
506506
android-sdk-build:
507-
name: Swift SDK for Android Build (${{ matrix.swift_version }} - ${{ matrix.os_version }})
507+
name: Swift SDK for Android Build (${{ matrix.swift_version }} - ${{ matrix.os_version }} - NDK ${{ matrix.ndk_version }})
508508
if: ${{ inputs.enable_android_sdk_build }}
509509
runs-on: ubuntu-latest
510510
strategy:
@@ -560,7 +560,7 @@ jobs:
560560
exit 1
561561
fi
562562
curl -s --retry 3 https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/install-and-build-with-sdk.sh | \
563-
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 }}
563+
bash -s -- --android --flags="$BUILD_FLAGS" --build-command="${{ inputs.android_sdk_build_command }}" --android-sdk-triple="${{ matrix.sdk_triple }}" --android-ndk-version="${{ matrix.ndk_version }}" ${{ matrix.swift_version }}
564564
565565
windows-build:
566566
name: Windows (${{ matrix.swift_version }} - windows-2022)

0 commit comments

Comments
 (0)