Skip to content

Commit 41dfe8f

Browse files
authored
Merge branch 'main' into rename_nightly_6_1_to_nightly_next
2 parents 42830cc + ffdc554 commit 41dfe8f

File tree

3 files changed

+30
-1
lines changed

3 files changed

+30
-1
lines changed

.github/workflows/main.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,15 @@ jobs:
2020
cxx-interop:
2121
name: Cxx interop
2222
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
23+
24+
static-sdk:
25+
name: Static SDK
26+
# Workaround https://github.com/nektos/act/issues/1875
27+
uses: apple/swift-nio/.github/workflows/static_sdk.yml@main
28+
29+
macos-tests:
30+
name: macOS tests
31+
uses: apple/swift-nio/.github/workflows/macos_tests.yml@main
32+
with:
33+
runner_pool: nightly
34+
build_scheme: swift-async-dns-resolver

.github/workflows/pull_request.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,15 @@ jobs:
2525
cxx-interop:
2626
name: Cxx interop
2727
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main
28+
29+
static-sdk:
30+
name: Static SDK
31+
# Workaround https://github.com/nektos/act/issues/1875
32+
uses: apple/swift-nio/.github/workflows/static_sdk.yml@main
33+
34+
macos-tests:
35+
name: macOS tests
36+
uses: apple/swift-nio/.github/workflows/macos_tests.yml@main
37+
with:
38+
runner_pool: general
39+
build_scheme: swift-async-dns-resolver

Package.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,16 @@ for target in package.targets {
5959

6060
// --- STANDARD CROSS-REPO SETTINGS DO NOT EDIT --- //
6161
for target in package.targets {
62-
if target.type != .plugin {
62+
switch target.type {
63+
case .regular, .test, .executable:
6364
var settings = target.swiftSettings ?? []
6465
// https://github.com/swiftlang/swift-evolution/blob/main/proposals/0444-member-import-visibility.md
6566
settings.append(.enableUpcomingFeature("MemberImportVisibility"))
6667
target.swiftSettings = settings
68+
case .macro, .plugin, .system, .binary:
69+
() // not applicable
70+
@unknown default:
71+
() // we don't know what to do here, do nothing
6772
}
6873
}
6974
// --- END: STANDARD CROSS-REPO SETTINGS DO NOT EDIT --- //

0 commit comments

Comments
 (0)