Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compile for Android #925

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
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
45 changes: 45 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
pull_request:
branches:
- "*"
workflow_dispatch:

jobs:
macos:
Expand Down Expand Up @@ -63,3 +64,47 @@ jobs:
- uses: actions/checkout@v4
- run: swift build
- run: swift test

android:
name: Android (Swift 6.0.2)
runs-on: ubuntu-22.04
steps:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Install Swift
uses: tayloraswift/swift-install-action@master
with:
swift-prefix: swift-6.0.2-release/ubuntu2204/swift-6.0.2-RELEASE
swift-id: swift-6.0.2-RELEASE-ubuntu22.04
- name: Check Swift
run: swift --version
- name: Install Android SDK
run:
swift sdk install https://github.com/finagolfin/swift-android-sdk/releases/download/6.0.2/swift-6.0.2-RELEASE-android-24-0.1.artifactbundle.tar.gz --checksum d75615eac3e614131133c7cc2076b0b8fb4327d89dce802c25cd53e75e1881f4
- name: Check Android SDK
run:
swift sdk configure --show-configuration swift-6.0.2-RELEASE-android-24-0.1 x86_64-unknown-linux-android24
- name: Build Tests
run:
swift build --build-tests --swift-sdk x86_64-unknown-linux-android24 -Xswiftc -Xclang-linker -Xswiftc -fuse-ld=lld
- name: Prepare Android Emulator Test Script
run: |
mkdir pack
cp .build/x86_64-unknown-linux-android24/debug/swift-snapshot-testingPackageTests.xctest pack

cp /home/runner/.config/swiftpm/swift-sdks/swift-6.0.2-RELEASE-android-24-0.1.artifactbundle/swift-6.0.2-release-android-24-sdk/android-27c-sysroot/usr/lib/x86_64-linux-android/24/lib*.so pack
rm pack/lib{c,dl,log,m,z}.so

set -x
cat > ~/test-toolchain.sh << EOF
adb push pack /data/local/tmp
adb shell /data/local/tmp/pack/swift-snapshot-testingPackageTests.xctest
EOF

chmod +x ~/test-toolchain.sh
- name: Run Tests on Android Emulator
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 29
arch: x86_64
script: ~/test-toolchain.sh
4 changes: 2 additions & 2 deletions Sources/SnapshotTesting/AssertSnapshot.swift
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ public func verifySnapshot<Value, Format>(

func recordSnapshot() throws {
try snapshotting.diffing.toData(diffable).write(to: snapshotFileUrl)
#if !os(Linux) && !os(Windows)
#if !os(Linux) && !os(Windows) && !os(Android)
if !isSwiftTesting,
ProcessInfo.processInfo.environment.keys.contains("__XCODE_BUILT_PRODUCTS_DIR_PATHS")
{
Expand Down Expand Up @@ -418,7 +418,7 @@ public func verifySnapshot<Value, Format>(
try snapshotting.diffing.toData(diffable).write(to: failedSnapshotFileUrl)

if !attachments.isEmpty {
#if !os(Linux) && !os(Windows)
#if !os(Linux) && !os(Windows) && !os(Android)
if ProcessInfo.processInfo.environment.keys.contains("__XCODE_BUILT_PRODUCTS_DIR_PATHS"),
!isSwiftTesting
{
Expand Down
2 changes: 1 addition & 1 deletion Sources/SnapshotTesting/Common/XCTAttachment.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if os(Linux) || os(Windows)
#if os(Linux) || os(Windows) || os(Android)
import Foundation

public struct XCTAttachment {
Expand Down
2 changes: 1 addition & 1 deletion Sources/SnapshotTesting/Internal/Deprecations.swift
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public func _verifyInlineSnapshot<Value>(

/// Did not successfully record, so we will fail.
if !attachments.isEmpty {
#if !os(Linux) && !os(Windows)
#if !os(Linux) && !os(Windows) && !os(Android)
if ProcessInfo.processInfo.environment.keys.contains("__XCODE_BUILT_PRODUCTS_DIR_PATHS") {
XCTContext.runActivity(named: "Attached Failure Diff") { activity in
attachments.forEach {
Expand Down
Loading