Skip to content

Enable more ci #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Feb 12, 2025
Merged

Enable more ci #712

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
edd77db
enable-formatter
rauhul Feb 7, 2025
5edab65
address UseLetInEveryBoundCaseVariable
rauhul Feb 8, 2025
2416238
address NeverForceUnwrap sorta...
rauhul Feb 8, 2025
3e0d338
address BeginDocumentationCommentWithOneLineSummary
rauhul Feb 8, 2025
a3e5a40
address ValidateDocumentationComments wip
rauhul Feb 8, 2025
6867e91
addres AlwaysUseCamelCase
rauhul Feb 10, 2025
c14f9cb
addres ValidateDocumentationComments
rauhul Feb 10, 2025
1b63fdd
passes formatter
rauhul Feb 10, 2025
a6c4bb4
enable format in ghactions
rauhul Feb 10, 2025
a804e32
fix lingering format error
rauhul Feb 10, 2025
b90715e
fix documentation check
rauhul Feb 10, 2025
ec46b16
Enable additional platform builds
rauhul Feb 10, 2025
627b785
Fixes for Windows CI
natecook1000 Feb 11, 2025
f5eb893
Merge branch 'main' into enable-more-ci
natecook1000 Feb 11, 2025
34fe7c8
Normalize line endings to `\n` in tests
natecook1000 Feb 11, 2025
eb41cfa
Fix remainder of Windows CI issues
natecook1000 Feb 11, 2025
34a9a15
Fix Linux tests that I broke while fixing Windows tests
natecook1000 Feb 11, 2025
a62221b
Merge branch 'main' into enable-more-ci
natecook1000 Feb 12, 2025
af8249d
Use URL path a little more nicely
natecook1000 Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/lint.yml → .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ jobs:
curl -sL https://raw.githubusercontent.com/apple/swift-mmio/refs/heads/main/.swift-format -o .swift-format-mmio
diff .swift-format .swift-format-mmio

tests:
name: Test
uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
with:
windows_exclude_swift_versions: "[{\"swift_version\": \"5.9\"}]"
soundness:
name: Soundness
uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
Expand Down
6 changes: 6 additions & 0 deletions Sources/ArgumentParserTestHelpers/StringHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,10 @@ extension String {
.map { $0.trimmed() }
.joined(separator: "\n")
}

public func normalizingLineEndings() -> String {
self
.replacingOccurrences(of: "\r\n", with: "\n")
.replacingOccurrences(of: "\r", with: "\n")
}
}
4 changes: 4 additions & 0 deletions Sources/ArgumentParserTestHelpers/TestHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,10 @@ public func AssertEqualStrings(
file: StaticString = #filePath,
line: UInt = #line
) {
// Normalize line endings to '\n'.
let actual = actual.normalizingLineEndings()
let expected = expected.normalizingLineEndings()

// If the input strings are not equal, create a simple diff for debugging...
guard actual != expected else {
// Otherwise they are equal, early exit.
Expand Down
4 changes: 4 additions & 0 deletions Tests/ArgumentParserUnitTests/CompletionScriptTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ extension CompletionScriptTests {
file: StaticString = #filePath,
line: UInt = #line
) throws {
#if !os(Windows) && !os(WASI)
do {
setenv("SAP_SHELL", shell, 1)
defer { unsetenv("SAP_SHELL") }
Expand All @@ -189,13 +190,15 @@ extension CompletionScriptTests {
file: file,
line: line)
}
#endif
}

func assertCustomCompletions(
shell: String,
file: StaticString = #filePath,
line: UInt = #line
) throws {
#if !os(Windows) && !os(WASI)
try assertCustomCompletion(
"-o", shell: shell, prefix: "e", file: file, line: line)
try assertCustomCompletion(
Expand All @@ -211,6 +214,7 @@ extension CompletionScriptTests {
try assertCustomCompletion("--bad", shell: shell, file: file, line: line))
XCTAssertThrowsError(
try assertCustomCompletion("four", shell: shell, file: file, line: line))
#endif
}

func testBashCustomCompletions() throws {
Expand Down
5 changes: 2 additions & 3 deletions Tests/ArgumentParserUnitTests/HelpGenerationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,7 @@ extension HelpGenerationTests {
var degree: Degree = .bachelor

@Option(help: "Directory.")
var directory: URL = URL(
fileURLWithPath: FileManager.default.currentDirectoryPath)
var directory: URL = URL(fileURLWithPath: "/path/to/file")

enum Manual: Int, ExpressibleByArgument {
case foo
Expand Down Expand Up @@ -229,7 +228,7 @@ extension HelpGenerationTests {
--lucky <numbers> Your lucky numbers. (default: 7, 14)
--optional/--required Vegan diet. (default: --optional)
--degree <degree> Your degree.
--directory <directory> Directory. (default: current directory)
--directory <directory> Directory. (default: file:///path/to/file)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm this should ideally use url.path

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, though this is all just internal to this test.

--manual <manual> Manual Option. (default: default-value)
--unspecial <unspecial> Unspecialized Synthesized (values: 0, 1; default: 0)
--special <special> Specialized Synthesized (values: Apple, Banana;
Expand Down