diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 8f66170d..0d8f98a1 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -184,15 +184,15 @@ jobs: run: swift test --disable-experimental-swift-testing build-swift-android: - name: Sample SwiftJavaExtractJNISampleApp (Android) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} android:${{matrix.sdk_triple}}) + name: Sample SwiftJavaExtractJNISampleApp (Android) (swift:${{ matrix.swift_version }} android:${{matrix.sdk_triple}} NDK:${{matrix.ndk_version}}) runs-on: ubuntu-latest strategy: fail-fast: false matrix: - swift_version: ['nightly-main'] + swift_version: ['nightly-main', 'nightly-6.3'] os_version: ['jammy'] jdk_vendor: ['corretto'] - sdk_triple: ['x86_64-unknown-linux-android28', 'armv7-unknown-linux-android28'] + sdk_triple: ['aarch64-unknown-linux-android28', 'x86_64-unknown-linux-android28', 'armv7-unknown-linux-android28'] ndk_version: ['r27d'] container: image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }} @@ -202,9 +202,6 @@ jobs: uses: ./.github/actions/prepare_env - name: Install Swift SDK for Android and build env: - JAVA_HOME: ${{ env.JAVA_HOME }} - JAVA_HOME_17: ${{ env.JAVA_HOME_17 }} - JAVA_HOME_25: ${{ env.JAVA_HOME_25 }} ANDROID_NDK_HOME: ${{ env.ANDROID_NDK_HOME }} run: | apt-get -q update && apt-get -yq install curl