From c41cc096cafd900c585d99f0385fbc8e4c6f6d74 Mon Sep 17 00:00:00 2001 From: Finagolfin Date: Wed, 25 Feb 2026 20:35:42 +0530 Subject: [PATCH 1/2] ci: stop building for Android in a container --- .github/workflows/pull_request.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 8f66170d..e09cd454 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -184,28 +184,21 @@ 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}}) - runs-on: ubuntu-latest + name: Sample SwiftJavaExtractJNISampleApp (Android) (swift:${{ matrix.swift_version }} android:${{matrix.sdk_triple}} NDK:${{matrix.ndk_version}}) + runs-on: ubuntu-22.04 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'] - ndk_version: ['r27d'] - container: - image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }} + sdk_triple: ['aarch64-unknown-linux-android28', 'x86_64-unknown-linux-android28', 'armv7-unknown-linux-android28'] + ndk_version: ['r27d', 'r28c'] steps: - uses: actions/checkout@v6 - name: Prepare CI Environment 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 cd Samples/SwiftJavaExtractJNISampleApp From 18d6c22ca4e75ed17f867c64135795b19953b2ef Mon Sep 17 00:00:00 2001 From: Finagolfin Date: Fri, 27 Feb 2026 16:17:17 +0530 Subject: [PATCH 2/2] Go back to the container build, just to see if the latest trunk snapshot fails there too --- .github/workflows/pull_request.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index e09cd454..0d8f98a1 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -185,7 +185,7 @@ jobs: build-swift-android: name: Sample SwiftJavaExtractJNISampleApp (Android) (swift:${{ matrix.swift_version }} android:${{matrix.sdk_triple}} NDK:${{matrix.ndk_version}}) - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest strategy: fail-fast: false matrix: @@ -193,12 +193,16 @@ jobs: os_version: ['jammy'] jdk_vendor: ['corretto'] sdk_triple: ['aarch64-unknown-linux-android28', 'x86_64-unknown-linux-android28', 'armv7-unknown-linux-android28'] - ndk_version: ['r27d', 'r28c'] + ndk_version: ['r27d'] + container: + image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }} steps: - uses: actions/checkout@v6 - name: Prepare CI Environment uses: ./.github/actions/prepare_env - name: Install Swift SDK for Android and build + env: + ANDROID_NDK_HOME: ${{ env.ANDROID_NDK_HOME }} run: | apt-get -q update && apt-get -yq install curl cd Samples/SwiftJavaExtractJNISampleApp