Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,30 @@ jobs:
- name: Swift Test
run: "swift test"

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
strategy:
fail-fast: false
matrix:
swift_version: ['nightly-main']
os_version: ['jammy']
jdk_vendor: ['corretto']
sdk_triple: ['x86_64-unknown-linux-android28']
ndk_version: ['r27d']
container:
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
steps:
- uses: actions/checkout@v4
- name: Prepare CI Environment
uses: ./.github/actions/prepare_env
- name: Install Swift SDK for Android and build
run: |
apt-get -q update && apt-get -yq install curl
cd Samples/SwiftJavaExtractJNISampleApp
curl -s --retry 3 https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/install-and-build-with-sdk.sh | \
bash -s -- --android --build-command="swift build" --android-sdk-triple="${{ matrix.sdk_triple }}" --android-ndk-version="${{ matrix.ndk_version }}" ${{ matrix.swift_version }}

verify-samples:
name: Sample ${{ matrix.sample_app }} (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
runs-on: ubuntu-latest
Expand Down
13 changes: 11 additions & 2 deletions Samples/SwiftJavaExtractJNISampleApp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,19 @@ def jextract = tasks.register("jextract", Exec) {
}
}

// FIXME: disable prebuilts until swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
def cmdArgs = ["build", "--disable-experimental-prebuilts"]

// Check if the 'swiftSdk' project property was passed
if (project.hasProperty('swiftSdk')) {
// If it was, add the --sdk argument and its value
cmdArgs.add("--swift-sdk")
cmdArgs.add(project.property('swiftSdk').toString())
}

workingDir = layout.projectDirectory
commandLine "swift"
// FIXME: disable prebuilts until swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
args("build", "--disable-experimental-prebuilts") // since Swift targets which need to be jextract-ed have the jextract build plugin, we just need to build
args(cmdArgs) // since Swift targets which need to be jextract-ed have the jextract build plugin, we just need to build
// If we wanted to execute a specific subcommand, we can like this:
// args("run",/*
// "swift-java", "jextract",
Expand Down
Loading