Skip to content

Commit 6e06280

Browse files
authored
Update install-and-build-with-sdk.sh to set second env var
1 parent 1ee8129 commit 6e06280

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -814,10 +814,9 @@ build() {
814814
local sdk_name="${ANDROID_SDK_TAG}_android"
815815

816816
alias swift='$SWIFT_EXECUTABLE_FOR_ANDROID_SDK'
817-
817+
ANDROID_NDK_ROOT="${ANDROID_NDK_HOME}"
818818
log "Using NDK at $ANDROID_NDK_HOME"
819-
820-
echo "ANDROID_NDK_HOME=${ANDROID_NDK_HOME}" >> $GITHUB_ENV
819+
821820
# This can become a single invocation in the future when `swift build` supports multiple Android triples at once
822821
for android_sdk_triple in "${ANDROID_SDK_TRIPLES[@]}" ; do
823822
if [[ "$SWIFT_VERSION_INPUT" == "6.3" || "$SWIFT_VERSION_INPUT" == "nightly-6.3" ]]; then
@@ -834,7 +833,7 @@ build() {
834833
local _swift_bin_dir
835834
_swift_bin_dir="$(dirname "$SWIFT_EXECUTABLE_FOR_ANDROID_SDK")"
836835
export PATH="$_swift_bin_dir:$PATH"
837-
836+
838837
if eval "$build_command -v"; then
839838
log "✅ Swift build with Android Swift SDK completed successfully"
840839
else

0 commit comments

Comments
 (0)