From db2ba6fe565af720fdeecb0a182fdfbf5aa9cf89 Mon Sep 17 00:00:00 2001 From: Johan Kool Date: Sat, 15 Feb 2025 12:56:25 +0100 Subject: [PATCH 1/2] Android CI --- .github/workflows/ci.yml | 6 ++++-- Package.resolved | 31 ++++++++++++++++--------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b644380..0ac3eeb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -137,6 +137,8 @@ jobs: android: name: Android - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - - uses: johankool/swift-android-test-action@v1 + - uses: actions/checkout@v4 + - name: "Test Swift Package on Android" + uses: skiptools/swift-android-action@v2 \ No newline at end of file diff --git a/Package.resolved b/Package.resolved index 5b81574..b09ecaa 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,12 +1,13 @@ { + "originHash" : "a1aef04d3f0b423866ffc16ead69fc6e7b9e5d992e4466ab2294d9b057ab1857", "pins" : [ { "identity" : "carton", "kind" : "remoteSourceControl", "location" : "https://github.com/swiftwasm/carton", "state" : { - "revision" : "d3f1da61faa05283e46a05698ac9bea46fd1035f", - "version" : "1.1.2" + "revision" : "57ab2e7c2419c0f6f2516d1c25142a9fb763ca7a", + "version" : "1.1.3" } }, { @@ -32,8 +33,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-collections.git", "state" : { - "revision" : "3d2dc41a01f9e49d84f0a3925fb858bed64f702d", - "version" : "1.1.2" + "revision" : "671108c96644956dddcd89dd59c203dcdb36cec7", + "version" : "1.1.4" } }, { @@ -41,17 +42,17 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-docc-plugin", "state" : { - "revision" : "3303b164430d9a7055ba484c8ead67a52f7b74f6", - "version" : "1.0.0" + "revision" : "85e4bb4e1cd62cec64a4b8e769dcefdf0c5b9d64", + "version" : "1.4.3" } }, { - "identity" : "swift-log", + "identity" : "swift-docc-symbolkit", "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-log.git", + "location" : "https://github.com/swiftlang/swift-docc-symbolkit", "state" : { - "revision" : "9cb486020ebf03bfa5b5df985387a14a98744537", - "version" : "1.6.1" + "revision" : "b45d1f2ed151d057b54504d653e0da5552844e34", + "version" : "1.0.0" } }, { @@ -59,8 +60,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-nio.git", "state" : { - "revision" : "fc79798d5a150d61361a27ce0c51169b889e23de", - "version" : "2.68.0" + "revision" : "c51907a839e63ebf0ba2076bba73dd96436bd1b9", + "version" : "2.81.0" } }, { @@ -68,8 +69,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-system.git", "state" : { - "revision" : "6a9e38e7bd22a3b8ba80bddf395623cf68f57807", - "version" : "1.3.1" + "revision" : "c8a44d836fe7913603e246acab7c528c2e780168", + "version" : "1.4.0" } }, { @@ -82,5 +83,5 @@ } } ], - "version" : 2 + "version" : 3 } From 85929c164598e1a6ad9112c05dc69f7a6e9847ff Mon Sep 17 00:00:00 2001 From: Johan Kool Date: Sat, 15 Feb 2025 19:23:40 +0100 Subject: [PATCH 2/2] Try CI without Package.resolved --- .gitignore | 1 + Package.resolved | 87 ------------------------------------------------ 2 files changed, 1 insertion(+), 87 deletions(-) delete mode 100644 Package.resolved diff --git a/.gitignore b/.gitignore index aa739b8..55f1898 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /Packages /*.xcodeproj xcuserdata/ +Package.resolved diff --git a/Package.resolved b/Package.resolved deleted file mode 100644 index b09ecaa..0000000 --- a/Package.resolved +++ /dev/null @@ -1,87 +0,0 @@ -{ - "originHash" : "a1aef04d3f0b423866ffc16ead69fc6e7b9e5d992e4466ab2294d9b057ab1857", - "pins" : [ - { - "identity" : "carton", - "kind" : "remoteSourceControl", - "location" : "https://github.com/swiftwasm/carton", - "state" : { - "revision" : "57ab2e7c2419c0f6f2516d1c25142a9fb763ca7a", - "version" : "1.1.3" - } - }, - { - "identity" : "swift-argument-parser", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-argument-parser.git", - "state" : { - "revision" : "46989693916f56d1186bd59ac15124caef896560", - "version" : "1.3.1" - } - }, - { - "identity" : "swift-atomics", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-atomics.git", - "state" : { - "revision" : "cd142fd2f64be2100422d658e7411e39489da985", - "version" : "1.2.0" - } - }, - { - "identity" : "swift-collections", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-collections.git", - "state" : { - "revision" : "671108c96644956dddcd89dd59c203dcdb36cec7", - "version" : "1.1.4" - } - }, - { - "identity" : "swift-docc-plugin", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-docc-plugin", - "state" : { - "revision" : "85e4bb4e1cd62cec64a4b8e769dcefdf0c5b9d64", - "version" : "1.4.3" - } - }, - { - "identity" : "swift-docc-symbolkit", - "kind" : "remoteSourceControl", - "location" : "https://github.com/swiftlang/swift-docc-symbolkit", - "state" : { - "revision" : "b45d1f2ed151d057b54504d653e0da5552844e34", - "version" : "1.0.0" - } - }, - { - "identity" : "swift-nio", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-nio.git", - "state" : { - "revision" : "c51907a839e63ebf0ba2076bba73dd96436bd1b9", - "version" : "2.81.0" - } - }, - { - "identity" : "swift-system", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-system.git", - "state" : { - "revision" : "c8a44d836fe7913603e246acab7c528c2e780168", - "version" : "1.4.0" - } - }, - { - "identity" : "wasmtransformer", - "kind" : "remoteSourceControl", - "location" : "https://github.com/swiftwasm/WasmTransformer", - "state" : { - "revision" : "d04b31f61b6f528a9a96ebfe4fa4275e333eba82", - "version" : "0.5.0" - } - } - ], - "version" : 3 -}