Skip to content

Commit 2ea4267

Browse files
authored
Disable warnings-as-errors for nightlies (#353)
Disable warnings-as-errors for nightlies ### Motivation In Swift 5.11/nigtlies Swift upgraded preconcurrency diagnostics from a remark to a warning, and since we run CI with warnings-as-errors, that broke it. I tried removing the preconcurrency attribute on imports in #352, but we still need it. Since main builds of Swift are still in-development, we shouldn't be so sensitive to changes there, so disabling warnings-as-errors for nightlies only (keeping for 5.8, 5.9, and 5.10). ### Modifications Disable warnings as errors on CI for nightlies. ### Result CI should pass again. ### Test Plan CI. Reviewed by: PeterAdams-A Builds: ✔︎ pull request validation (5.10) - Build finished. ✔︎ pull request validation (5.8) - Build finished. ✔︎ pull request validation (5.9) - Build finished. ✔︎ pull request validation (compatibility test) - Build finished. ✔︎ pull request validation (docc test) - Build finished. ✔︎ pull request validation (integration test) - Build finished. ✔︎ pull request validation (nightly) - Build finished. ✔︎ pull request validation (soundness) - Build finished. #353
1 parent dfdbd72 commit 2ea4267

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

Sources/_OpenAPIGeneratorCore/GeneratorPipeline.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -103,21 +103,21 @@ func makeGeneratorPipeline(
103103
config: Config,
104104
diagnostics: any DiagnosticCollector
105105
) -> GeneratorPipeline {
106+
let filterDoc = { (doc: OpenAPI.Document) -> OpenAPI.Document in
107+
guard let documentFilter = config.filter else { return doc }
108+
let filteredDoc: OpenAPI.Document = try documentFilter.filter(doc)
109+
return filteredDoc
110+
}
111+
let validateDoc = { (doc: OpenAPI.Document) -> OpenAPI.Document in
112+
let validationDiagnostics = try validator(doc, config)
113+
for diagnostic in validationDiagnostics { diagnostics.emit(diagnostic) }
114+
return doc
115+
}
106116
return .init(
107117
parseOpenAPIFileStage: .init(
108118
preTransitionHooks: [],
109119
transition: { input in try parser.parseOpenAPI(input, config: config, diagnostics: diagnostics) },
110-
postTransitionHooks: [
111-
{ document in
112-
guard let documentFilter = config.filter else { return document }
113-
return try documentFilter.filter(document)
114-
},
115-
{ doc in
116-
let validationDiagnostics = try validator(doc, config)
117-
for diagnostic in validationDiagnostics { diagnostics.emit(diagnostic) }
118-
return doc
119-
},
120-
]
120+
postTransitionHooks: [filterDoc, validateDoc]
121121
),
122122
translateOpenAPIToStructuredSwiftStage: .init(
123123
preTransitionHooks: [],

docker/docker-compose.2204.main.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ services:
1111
test:
1212
image: *image
1313
environment:
14-
- WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors
14+
# Disable warnings as errors on nightlies as they are still in-development.
15+
# - WARN_AS_ERROR_ARG=-Xswiftc -warnings-as-errors
1516
- IMPORT_CHECK_ARG=--explicit-target-dependency-import-check error
1617
- STRICT_CONCURRENCY_ARG=-Xswiftc -strict-concurrency=complete
1718
shell:

0 commit comments

Comments
 (0)