Compile for Android (also on CI) (#210)

pointfreeco · Dec 7, 2024 · a1327f2 · a1327f2
1 parent 9b1eb08
commit a1327f2
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -123,3 +123,47 @@ jobs:
   #     - uses: actions/checkout@v4
   #     - name: Build
   #       run: swift build -c ${{ matrix.config }}
+
+  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:
+          OMIT_MACRO_TESTS=1 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-case-pathsPackageTests.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-case-pathsPackageTests.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
diff --git a/Package.resolved b/Package.resolved
@@ -1,19 +1,19 @@
 {
-  "originHash" : "d955dccabe54030895917a92ad252b0a5d4e823f6fefc262cdb2869f8731dbe4",
+  "originHash" : "e4bb2d04e477a6c143e71b4967a73419b0f830aeecd56f64be2b7060b746a574",
   "pins" : [
     {
       "identity" : "swift-docc-plugin",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-docc-plugin",
       "state" : {
-        "revision" : "26ac5758409154cc448d7ab82389c520fa8a8247",
-        "version" : "1.3.0"
+        "revision" : "85e4bb4e1cd62cec64a4b8e769dcefdf0c5b9d64",
+        "version" : "1.4.3"
       }
     },
     {
       "identity" : "swift-docc-symbolkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-docc-symbolkit",
+      "location" : "https://github.com/swiftlang/swift-docc-symbolkit",
       "state" : {
         "revision" : "b45d1f2ed151d057b54504d653e0da5552844e34",
         "version" : "1.0.0"
@@ -33,26 +33,26 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-snapshot-testing",
       "state" : {
-        "revision" : "7b0bbbae90c41f848f90ac7b4df6c4f50068256d",
-        "version" : "1.17.5"
+        "revision" : "42a086182681cf661f5c47c9b7dc3931de18c6d7",
+        "version" : "1.17.6"
       }
     },
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/swiftlang/swift-syntax",
       "state" : {
-        "revision" : "cb53fa1bd3219b0b23ded7dfdd3b2baff266fd25",
-        "version" : "600.0.0"
+        "revision" : "0687f71944021d616d34d922343dcef086855920",
+        "version" : "600.0.1"
       }
     },
     {
       "identity" : "xctest-dynamic-overlay",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
       "state" : {
-        "revision" : "27d767d643fa2cf083d0a73d74fa84cacb53e85c",
-        "version" : "1.4.1"
+        "revision" : "a3f634d1a409c7979cabc0a71b3f26ffa9fc8af1",
+        "version" : "1.4.3"
       }
     }
   ],

diff --git a/Tests/CasePathsTests/CasePathableTests.swift b/Tests/CasePathsTests/CasePathableTests.swift
@@ -9,7 +9,7 @@ final class CasePathableTests: XCTestCase {
     XCTAssertEqual(result, .success(2))
   }
 
-  #if DEBUG && !os(Linux) && !os(Windows) && !os(WASI)
+  #if DEBUG && !os(Linux) && !os(Windows) && !os(WASI) && !os(Android)
     func testModifyWrongCase() {
       guard ProcessInfo.processInfo.environment["CI"] == nil else { return }
       var response = Result<Int, MyError>.failure(MyError())

diff --git a/Tests/CasePathsTests/CasePathsTests.swift b/Tests/CasePathsTests/CasePathsTests.swift
@@ -116,7 +116,7 @@ final class CasePathsTests: XCTestCase {
     XCTAssertEqual(foo, .bar(.int(42)))
   }
 
-  #if DEBUG && !os(Linux) && !os(Windows) && !os(WASI)
+  #if DEBUG && !os(Linux) && !os(Windows) && !os(WASI) && !os(Android)
     func testCasePathableModify_Failure() {
       guard ProcessInfo.processInfo.environment["CI"] == nil else { return }
       var foo = Foo.bar(.int(21))