Skip to content

Commit 46dd772

Browse files
FranzBuschFranzBusch
authored
Merge pull request #68 from FranzBusch/fb-gha-fix
[CI] Make all CI checks green
2 parents 70cda1b + 5eeef94 commit 46dd772

30 files changed

+550
-215
lines changed

‎.github/workflows/main.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: Main
33
on:
44
push:
55
branches: [main]
6+
schedule:
7+
- cron: "0 8,20 * * *"
68

79
jobs:
810
unit-tests:
@@ -21,6 +23,12 @@ jobs:
2123
windows_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
2224
windows_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
2325

26+
benchmarks:
27+
name: Benchmarks
28+
uses: apple/swift-nio/.github/workflows/benchmarks.yml@main
29+
with:
30+
benchmark_package_path: "Benchmarks"
31+
2432
cxx-interop:
2533
name: Cxx interop
2634
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main

‎.github/workflows/pull_request.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ jobs:
2727
windows_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
2828
windows_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
2929

30+
benchmarks:
31+
name: Benchmarks
32+
uses: apple/swift-nio/.github/workflows/benchmarks.yml@main
33+
with:
34+
benchmark_package_path: "Benchmarks"
35+
3036
cxx-interop:
3137
name: Cxx interop
3238
uses: apple/swift-nio/.github/workflows/cxx_interop.yml@main

‎.github/workflows/scheduled.yml‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎.licenseignore‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
.gitignore
2+
**/.gitignore
3+
.licenseignore
4+
.gitattributes
5+
.git-blame-ignore-revs
6+
.mailfilter
7+
.mailmap
8+
.spi.yml
9+
.swift-format
10+
.editorconfig
11+
.github/*
12+
*.md
13+
*.txt
14+
*.yml
15+
*.yaml
16+
*.json
17+
Package.swift
18+
**/Package.swift
19+
Package@-*.swift
20+
**/Package@-*.swift
21+
Package.resolved
22+
**/Package.resolved
23+
Makefile
24+
*.modulemap
25+
**/*.modulemap
26+
**/*.docc/*
27+
*.xcprivacy
28+
**/*.xcprivacy
29+
*.symlink
30+
**/*.symlink
31+
Dockerfile
32+
**/Dockerfile
33+
Sources/CMakeLists.txt
34+
Sources/SwiftASN1/CMakeLists.txt
35+
dev/alloc-limits-from-test-output
36+
dev/boxed-existentials.d
37+
dev/git.commit.template
38+
dev/lldb-smoker
39+
dev/make-single-file-spm
40+
dev/malloc-aggregation.d
41+
dev/update-alloc-limits-to-last-completed-ci-build
42+
Benchmarks/Benchmarks/SwiftASN1Benchmark/ca-certificates/*.crt
43+
Benchmarks/Benchmarks/SwiftASN1Benchmark/ca-certificates/*/*.crt

‎.swift-format‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{
2+
"version" : 1,
3+
"indentation" : {
4+
"spaces" : 4
5+
},
6+
"tabWidth" : 4,
7+
"fileScopedDeclarationPrivacy" : {
8+
"accessLevel" : "private"
9+
},
10+
"spacesAroundRangeFormationOperators" : false,
11+
"indentConditionalCompilationBlocks" : false,
12+
"indentSwitchCaseLabels" : false,
13+
"lineBreakAroundMultilineExpressionChainComponents" : false,
14+
"lineBreakBeforeControlFlowKeywords" : false,
15+
"lineBreakBeforeEachArgument" : true,
16+
"lineBreakBeforeEachGenericRequirement" : true,
17+
"lineLength" : 120,
18+
"maximumBlankLines" : 1,
19+
"respectsExistingLineBreaks" : true,
20+
"prioritizeKeepingFunctionOutputTogether" : true,
21+
"rules" : {
22+
"AllPublicDeclarationsHaveDocumentation" : false,
23+
"AlwaysUseLiteralForEmptyCollectionInit" : false,
24+
"AlwaysUseLowerCamelCase" : false,
25+
"AmbiguousTrailingClosureOverload" : true,
26+
"BeginDocumentationCommentWithOneLineSummary" : false,
27+
"DoNotUseSemicolons" : true,
28+
"DontRepeatTypeInStaticProperties" : true,
29+
"FileScopedDeclarationPrivacy" : true,
30+
"FullyIndirectEnum" : true,
31+
"GroupNumericLiterals" : true,
32+
"IdentifiersMustBeASCII" : true,
33+
"NeverForceUnwrap" : false,
34+
"NeverUseForceTry" : false,
35+
"NeverUseImplicitlyUnwrappedOptionals" : false,
36+
"NoAccessLevelOnExtensionDeclaration" : true,
37+
"NoAssignmentInExpressions" : true,
38+
"NoBlockComments" : true,
39+
"NoCasesWithOnlyFallthrough" : true,
40+
"NoEmptyTrailingClosureParentheses" : true,
41+
"NoLabelsInCasePatterns" : true,
42+
"NoLeadingUnderscores" : false,
43+
"NoParensAroundConditions" : true,
44+
"NoVoidReturnOnFunctionSignature" : true,
45+
"OmitExplicitReturns" : true,
46+
"OneCasePerLine" : true,
47+
"OneVariableDeclarationPerLine" : true,
48+
"OnlyOneTrailingClosureArgument" : true,
49+
"OrderedImports" : true,
50+
"ReplaceForEachWithForLoop" : true,
51+
"ReturnVoidInsteadOfEmptyTuple" : true,
52+
"UseEarlyExits" : false,
53+
"UseExplicitNilCheckInConditions" : false,
54+
"UseLetInEveryBoundCaseVariable" : false,
55+
"UseShorthandTypeNames" : true,
56+
"UseSingleLinePropertyGetter" : false,
57+
"UseSynthesizedInitializer" : false,
58+
"UseTripleSlashForDocumentationComments" : true,
59+
"UseWhereClausesInForLoops" : false,
60+
"ValidateDocumentationComments" : false
61+
}
62+
}

‎.swiftformat‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎Benchmarks/Benchmarks/HTTPFieldsBenchmarks/Benchmarks.swift‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,18 @@ import Benchmark
1616
import HTTPTypes
1717

1818
let benchmarks = {
19+
let defaultMetrics: [BenchmarkMetric] = [
20+
.mallocCountTotal
21+
]
22+
1923
Benchmark(
20-
"Initialize HTTPFields from Dictionary Literal"
24+
"HTTPFields.init(dictionaryLiteral)",
25+
configuration: .init(
26+
metrics: defaultMetrics,
27+
scalingFactor: .kilo,
28+
maxDuration: .seconds(10_000_000),
29+
maxIterations: 10
30+
)
2131
) { _ in
2232
let fiels: HTTPFields = [
2333
.contentType: "application/json",

‎Benchmarks/Package.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import PackageDescription
55
let package = Package(
66
name: "Benchmarks",
77
platforms: [
8-
.macOS(.v13),
8+
.macOS(.v13)
99
],
1010
dependencies: [
1111
.package(path: "../"),
@@ -20,8 +20,8 @@ let package = Package(
2020
],
2121
path: "Benchmarks/HTTPFieldsBenchmarks",
2222
plugins: [
23-
.plugin(name: "BenchmarkPlugin", package: "package-benchmark"),
23+
.plugin(name: "BenchmarkPlugin", package: "package-benchmark")
2424
]
25-
),
25+
)
2626
]
2727
)

‎Benchmarks/Thresholds/5.10/Benchmarks.HTTPFields.init(dictionaryLiteral).p90.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"mallocCountTotal" : 14
3+
}

‎Benchmarks/Thresholds/5.9/Benchmarks.HTTPFields.init(dictionaryLiteral).p90.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"mallocCountTotal" : 14
3+
}

0 commit comments

Comments
 (0)