Skip to content

Commit 2b5fdff

Browse files
committed
Unset ANDROID_NDK_ROOT for recent Swift versions (finagolfin/swift-android-sdk#207)
1 parent ec0268d commit 2b5fdff

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.github/workflows/test-action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
os: ['ubuntu-24.04', 'ubuntu-22.04', 'macos-13', 'macos-15']
14-
swift-version: ['6.0.3', '6.1-DEVELOPMENT-SNAPSHOT-2025-02-14-a', '6.1-DEVELOPMENT-SNAPSHOT-2025-03-07-a']
14+
swift-version: ['6.0.3', '6.1-DEVELOPMENT-SNAPSHOT-2025-03-07-a']
1515
steps:
1616
- name: Checkout Action
1717
uses: actions/checkout@v4
@@ -70,7 +70,7 @@ jobs:
7070
fail-fast: false
7171
matrix:
7272
os: ['ubuntu-24.04', 'ubuntu-22.04', 'macos-13', 'macos-15']
73-
swift-version: ['6.0.3', '6.1-DEVELOPMENT-SNAPSHOT-2025-02-14-a', '6.1-DEVELOPMENT-SNAPSHOT-2025-03-07-a']
73+
swift-version: ['6.0.3', '6.1-DEVELOPMENT-SNAPSHOT-2025-03-07-a']
7474
steps:
7575
- name: Checkout Action
7676
uses: actions/checkout@v4

action.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,12 @@ runs:
153153
echo "SWIFT_BRANCH: ${SWIFT_BRANCH}"
154154
echo "swift-branch=${SWIFT_BRANCH}" >> $GITHUB_OUTPUT
155155
156+
if [[ ${SWIFT_VERSION_ID} != swift-6.0* ]]; then
157+
# recent releases require that ANDROID_NDK_ROOT *not* be set
158+
# see https://github.com/finagolfin/swift-android-sdk/issues/207
159+
echo "ANDROID_NDK_ROOT=" >> $GITHUB_ENV
160+
fi
161+
156162
- name: Cache Swift ${{ steps.setup.outputs.swift-version }} Host Toolchain
157163
uses: actions/cache@v4
158164
id: cache-swift

0 commit comments

Comments
 (0)