Skip to content

Commit 3ebdfbb

Browse files
madsodgaardktoso
andauthored
Add CI to build JNI Sample for Android (#427)
Co-authored-by: Konrad `ktoso` Malawski <[email protected]>
1 parent a9f4f07 commit 3ebdfbb

File tree

2 files changed

+35
-2
lines changed

2 files changed

+35
-2
lines changed

.github/workflows/pull_request.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,30 @@ jobs:
176176
- name: Swift Test
177177
run: "swift test"
178178

179+
build-swift-android:
180+
name: Sample SwiftJavaExtractJNISampleApp (Android) (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}} android:${{matrix.sdk_triple}})
181+
runs-on: ubuntu-latest
182+
strategy:
183+
fail-fast: false
184+
matrix:
185+
swift_version: ['nightly-main']
186+
os_version: ['jammy']
187+
jdk_vendor: ['corretto']
188+
sdk_triple: ['x86_64-unknown-linux-android28']
189+
ndk_version: ['r27d']
190+
container:
191+
image: ${{ (contains(matrix.swift_version, 'nightly') && 'swiftlang/swift') || 'swift' }}:${{ matrix.swift_version }}-${{ matrix.os_version }}
192+
steps:
193+
- uses: actions/checkout@v4
194+
- name: Prepare CI Environment
195+
uses: ./.github/actions/prepare_env
196+
- name: Install Swift SDK for Android and build
197+
run: |
198+
apt-get -q update && apt-get -yq install curl
199+
cd Samples/SwiftJavaExtractJNISampleApp
200+
curl -s --retry 3 https://raw.githubusercontent.com/swiftlang/github-workflows/refs/heads/main/.github/workflows/scripts/install-and-build-with-sdk.sh | \
201+
bash -s -- --android --build-command="swift build" --android-sdk-triple="${{ matrix.sdk_triple }}" --android-ndk-version="${{ matrix.ndk_version }}" ${{ matrix.swift_version }}
202+
179203
verify-samples:
180204
name: Sample ${{ matrix.sample_app }} (${{ matrix.os_version }} swift:${{ matrix.swift_version }} jdk:${{matrix.jdk_vendor}})
181205
runs-on: ubuntu-latest

Samples/SwiftJavaExtractJNISampleApp/build.gradle

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,19 @@ def jextract = tasks.register("jextract", Exec) {
100100
}
101101
}
102102

103+
// FIXME: disable prebuilts until swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
104+
def cmdArgs = ["build", "--disable-experimental-prebuilts"]
105+
106+
// Check if the 'swiftSdk' project property was passed
107+
if (project.hasProperty('swiftSdk')) {
108+
// If it was, add the --sdk argument and its value
109+
cmdArgs.add("--swift-sdk")
110+
cmdArgs.add(project.property('swiftSdk').toString())
111+
}
112+
103113
workingDir = layout.projectDirectory
104114
commandLine "swift"
105-
// FIXME: disable prebuilts until swift-syntax isn't broken on 6.2 anymore: https://github.com/swiftlang/swift-java/issues/418
106-
args("build", "--disable-experimental-prebuilts") // since Swift targets which need to be jextract-ed have the jextract build plugin, we just need to build
115+
args(cmdArgs) // since Swift targets which need to be jextract-ed have the jextract build plugin, we just need to build
107116
// If we wanted to execute a specific subcommand, we can like this:
108117
// args("run",/*
109118
// "swift-java", "jextract",

0 commit comments

Comments
 (0)