Skip to content

Commit ad50988

Browse files
committed
Lint fixes and update pull_request test to use branch install-and-build-with-sdk.sh
1 parent 2f1467e commit ad50988

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.github/workflows/scripts/install-and-build-with-sdk.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ install_android_sdk() {
569569
fi
570570

571571
# now setup the link to the local ANDROID_NDK_HOME
572-
${HOME}/.config/swiftpm/swift-sdks/${android_sdk_bundle_dir}/swift-android/scripts/setup-android-sdk.sh
572+
"${HOME}"/.config/swiftpm/swift-sdks/${android_sdk_bundle_dir}/swift-android/scripts/setup-android-sdk.sh
573573
}
574574

575575
install_static_linux_sdk() {

.github/workflows/swift_package_test.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,8 +486,10 @@ jobs:
486486
echo "Unknown package manager (tried apt-get, dnf, yum)" >&2
487487
exit 1
488488
fi
489-
curl -s --retry 3 https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/install-and-build-with-sdk.sh | \
490-
bash -s -- --android --flags="$BUILD_FLAGS" --build-command="${{ inputs.android_sdk_build_command }}" --android-sdk-tripe="${{ inputs.android_sdk_triple }}" ${{ matrix.swift_version }}
489+
# FIXME: restore to main when this PR is ready to be merged
490+
#curl -s --retry 3 https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/install-and-build-with-sdk.sh | \
491+
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 | \
492+
bash -s -- --android --flags="$BUILD_FLAGS" --build-command="${{ inputs.android_sdk_build_command }}" --android-sdk-triple="${{ inputs.android_sdk_triple }}" ${{ matrix.swift_version }}
491493
492494
windows-build:
493495
name: Windows (${{ matrix.swift_version }} - windows-2022)

0 commit comments

Comments
 (0)