From bba050d3bdc030eb2a04dc8fc10c5d0af0f5d8a3 Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Sat, 29 Mar 2025 18:54:50 -0400 Subject: [PATCH 1/5] Android support and CI --- .github/workflows/main.yml | 5 +++++ Sources/OpenAPIURLSession/BufferedStream/Lock.swift | 2 ++ 2 files changed, 7 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1707e95..6e08977 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,3 +26,8 @@ jobs: uses: apple/swift-nio/.github/workflows/macos_tests.yml@main with: build_scheme: swift-openapi-urlsession + + android-tests: + name: Android tests + uses: skiptools/swift-android-action@v2 + diff --git a/Sources/OpenAPIURLSession/BufferedStream/Lock.swift b/Sources/OpenAPIURLSession/BufferedStream/Lock.swift index b6e82e2..3c6af4b 100644 --- a/Sources/OpenAPIURLSession/BufferedStream/Lock.swift +++ b/Sources/OpenAPIURLSession/BufferedStream/Lock.swift @@ -28,6 +28,8 @@ #if canImport(Darwin) import Darwin +#elseif canImport(Android) +import Android #elseif canImport(Glibc) import Glibc #endif From d61cb125751e9ed2b5e9bc45cfcc6033821687cd Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Sat, 29 Mar 2025 18:57:02 -0400 Subject: [PATCH 2/5] Fix CI From 4f055770d344f084df8cd4633588db273cacd711 Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Sat, 29 Mar 2025 18:58:10 -0400 Subject: [PATCH 3/5] Fix CI --- .github/workflows/main.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6e08977..1e2cffe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,5 +29,10 @@ jobs: android-tests: name: Android tests - uses: skiptools/swift-android-action@v2 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: "Test Swift Package on Android" + uses: skiptools/swift-android-action@v2 + From 5aa1676eec8033f23a3da4c1c05025623b7aa774 Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Sat, 29 Mar 2025 19:29:11 -0400 Subject: [PATCH 4/5] Remove whitespace in CI script to satisfy linter checks --- .github/workflows/main.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1e2cffe..14e5f87 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,5 +34,3 @@ jobs: - uses: actions/checkout@v4 - name: "Test Swift Package on Android" uses: skiptools/swift-android-action@v2 - - From b117fa9cab7d0a192dbafdff0924be5497f9cd36 Mon Sep 17 00:00:00 2001 From: Marc Prud'hommeaux Date: Mon, 31 Mar 2025 08:28:46 -0400 Subject: [PATCH 5/5] Remove Android CI --- .github/workflows/main.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 14e5f87..1707e95 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,11 +26,3 @@ jobs: uses: apple/swift-nio/.github/workflows/macos_tests.yml@main with: build_scheme: swift-openapi-urlsession - - android-tests: - name: Android tests - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: "Test Swift Package on Android" - uses: skiptools/swift-android-action@v2