Set ANDROID_NDK_HOME instead of ANDROID_NDK_ROOT; permit ndk-version=latest to use ANDROID_NDK_LATEST_HOME

Author: marcprux

.github/workflows/test-action.yml

@@ -13,7 +13,7 @@ jobs:
         os: ['ubuntu-24.04', 'ubuntu-22.04', 'macos-13', 'macos-15']
         #swift-version: ['6.0', '6.1']
         swift-version: ['6.0', '6.1', '6.1.1', 'nightly-6.2']
-        ndk-version: ['27', '28']
+        ndk-version: ['27', 'latest']
     steps:
       - name: Checkout Action
         uses: actions/checkout@v4
@@ -40,6 +40,19 @@ jobs:
           copy-files: Tests
           test-env: TEST_WORKSPACE=1
 
+      - name: Checkout apple/swift-system
+        uses: actions/checkout@v4
+        with:
+          repository: apple/swift-system
+          path: apple/swift-system
+      - name: Test apple/swift-system
+        uses: ./swift-android-action/
+        with:
+          package-path: apple/swift-system
+          swift-version: ${{ matrix.swift-version }}
+          ndk-version: ${{ matrix.ndk-version }}
+          run-tests: ${{ matrix.os != 'macos-15' }} # no tests on macOS ARM
+
       - name: Checkout skiptools/swift-android-native
         uses: actions/checkout@v4
         with:
@@ -69,19 +82,19 @@ jobs:
       - name: Setup Toolchain
         id: setup-toolchain
         uses: ./swift-android-action/
-        #uses: skiptools/swift-android-action@v2
+        #uses: swift-android-sdk/swift-android-action@v2
         with:
           # just set up the toolchain and don't build anything
           build-package: false
           swift-version: ${{ matrix.swift-version }}
           ndk-version: ${{ matrix.ndk-version }}
-      - name: Checkout apple/swift-numerics
+      - name: Checkout apple/swift-algorithms
         uses: actions/checkout@v4
         with:
-          repository: apple/swift-numerics
-          path: apple/swift-numerics
+          repository: apple/swift-algorithms
+          path: apple/swift-algorithms
       - name: Build Package With Toolchain
-        working-directory: apple/swift-numerics
+        working-directory: apple/swift-algorithms
         run: |
           echo "SWIFT COMMAND: ${{ steps.setup-toolchain.outputs.swift-build }}"
           ${{ steps.setup-toolchain.outputs.swift-build }} -c debug

action.yml

@@ -225,10 +225,21 @@ runs:
         echo "swift-branch=${SWIFT_BRANCH}" >> $GITHUB_OUTPUT
 
         NDK_VERSION="${{ inputs.ndk-version }}"
-        if [[ "${NDK_VERSION}" != '' ]]; then
+        if [[ "${NDK_VERSION}" == 'latest' ]]; then
+          # can set latest, which is currently 28. See:
+          # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md#environment-variables-2
+          # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#environment-variables-1
+          echo "ANDROID_NDK_HOME={ANDROID_NDK_LATEST_HOME}" >> $GITHUB_ENV
+        elif [[ "${NDK_VERSION}" != '' ]]; then
           # we can set ndk-version to "27" or "27.0" or "27.2.12479018"
-          NDK_BASE=$(dirname "${ANDROID_NDK_ROOT}")
-          echo "ANDROID_NDK_ROOT=$(ls -rd ${NDK_BASE}/${NDK_VERSION}* | head -n 1)" >> $GITHUB_ENV
+          NDK_BASE=$(dirname "${ANDROID_NDK_HOME}")
+          # the setup scripts use "ANDROID_NDK_HOME" for linking the NDK
+          echo "ANDROID_NDK_HOME=$(ls -rd ${NDK_BASE}/${NDK_VERSION}* | head -n 1)" >> $GITHUB_ENV
+        fi
+
+        if [[ ${SWIFT_VERSION_ID} != swift-6.0* ]]; then
+          # see https://github.com/finagolfin/swift-android-sdk/issues/207
+          echo "ANDROID_NDK_ROOT=" >> $GITHUB_ENV
         fi
 
     - name: Cache Swift ${{ steps.setup.outputs.swift-version }} Host Toolchain
@@ -377,11 +388,6 @@ runs:
         # plugin-path is a workaround for https://github.com/swiftlang/swift-package-manager/issues/8362
         echo "swiftcmd=TARGET_OS_ANDROID=1 SKIP_BRIDGE=1 ${SWIFT_INSTALLATION}/bin/swift build --swift-sdk ${SWIFT_SDK_TARGET} -Xswiftc -plugin-path -Xswiftc ${SWIFT_INSTALLATION}/lib/swift/host/plugins/testing -Xswiftc -DTARGET_OS_ANDROID -Xswiftc -DSKIP_BRIDGE ${{ inputs.swift-build-flags }}" >> $GITHUB_OUTPUT
         echo "swift-sdk=${SWIFT_SDK_TARGET}" >> $GITHUB_OUTPUT
-
-        if [[ ${SWIFT_VERSION_ID} != swift-6.0* ]]; then
-          # see https://github.com/finagolfin/swift-android-sdk/issues/207
-          echo "ANDROID_NDK_ROOT=" >> $GITHUB_ENV
-        fi
     - name: Check Swift Version
       shell: bash
       run: |