Skip to content

Commit 46c8c79

Browse files
authored
Merge branch 'main' into android-ci
2 parents d14dedf + efdbd63 commit 46c8c79

File tree

3 files changed

+5
-23
lines changed

3 files changed

+5
-23
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,24 +59,6 @@ jobs:
5959
- name: Build
6060
run: swift build --swift-sdk wasm32-unknown-wasi -Xlinker -z -Xlinker stack-size=$((1024 * 1024))
6161

62-
windows:
63-
name: Windows
64-
strategy:
65-
matrix:
66-
os: [windows-latest]
67-
config: ['debug', 'release']
68-
runs-on: ${{ matrix.os }}
69-
steps:
70-
- uses: compnerd/gha-setup-swift@main
71-
with:
72-
branch: swift-5.10-release
73-
tag: 5.10-RELEASE
74-
- uses: actions/checkout@v4
75-
- name: Build All Configurations
76-
run: swift build -c ${{ matrix.config }}
77-
- name: Run tests (debug only)
78-
run: swift test
79-
8062
android:
8163
name: Android
8264
runs-on: ubuntu-latest

Package.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version: 5.9
1+
// swift-tools-version: 6.0
22

33
import PackageDescription
44

@@ -25,9 +25,6 @@ let package = Package(
2525
dependencies: [
2626
.product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
2727
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
28-
],
29-
swiftSettings: [
30-
.enableExperimentalFeature("StrictConcurrency")
3128
]
3229
),
3330
.testTarget(
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version: 6.0
1+
// swift-tools-version: 5.9
22

33
import PackageDescription
44

@@ -25,6 +25,9 @@ let package = Package(
2525
dependencies: [
2626
.product(name: "IssueReporting", package: "xctest-dynamic-overlay"),
2727
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
28+
],
29+
swiftSettings: [
30+
.enableExperimentalFeature("StrictConcurrency")
2831
]
2932
),
3033
.testTarget(

0 commit comments

Comments
 (0)