Skip to content

[5.5] Ignore .docc files rather than emitting warnings, since it's useful to have them in packages without warnings #3616

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.

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 1 commit into from
Jul 19, 2021

Conversation

abertelrud
Copy link
Contributor

This is the 5.5 nomination of #3609. Same motivation and changes as in that PR.

@abertelrud abertelrud requested a review from friedbunny as a code owner July 16, 2021 00:27
@abertelrud abertelrud self-assigned this Jul 16, 2021
@abertelrud abertelrud added 5.5 ready Author believes the PR is ready to be merged & any feedback has been addressed labels Jul 16, 2021
@abertelrud
Copy link
Contributor Author

@swift-ci please smoke test

@tomerd
Copy link
Contributor

tomerd commented Jul 16, 2021

@swift-ci test

@abertelrud
Copy link
Contributor Author

The full test failure looks unrelated:

/Users/buildnode/jenkins/workspace/swift-package-manager-PR-macos-smoke-test/branch-release/5.5/swiftpm/Sources/Commands/SwiftBuildTool.swift:86:35: error: argument passed to call that takes no arguments
21:11:34     @OptionGroup(_hiddenFromHelp: true)
21:11:34                                   ^~~~
21:11:34 /Users/buildnode/jenkins/workspace/swift-package-manager-PR-macos-smoke-test/branch-release/5.5/swiftpm/Sources/Commands/SwiftBuildTool.swift:87:9: note: cannot automatically synthesize 'Decodable' because '<<error type>>' does not conform to 'Decodable'
21:11:34     var swiftOptions: SwiftToolOptions
21:11:34         ^
21:11:34 /Users/buildnode/jenkins/workspace/swift-package-manager-PR-macos-smoke-test/branch-release/5.5/swiftpm/Sources/Commands/SwiftBuildTool.swift:77:15: error: type 'SwiftBuildTool' does not conform to protocol 'Decodable'
21:11:34 public struct SwiftBuildTool: SwiftCommand {
21:11:34               ^
21:11:34 Swift.Decodable:2:5: note: protocol requires initializer 'init(from:)' with type 'Decodable'
21:11:34     init(from decoder: Decoder) throws
21:11:34     ^
21:11:34 ninja: build stopped: subcommand failed.

@abertelrud
Copy link
Contributor Author

In fact that looks like an issue with the swift-argument-parser version being used.

@abertelrud
Copy link
Contributor Author

Ah yes, that is mentioned in other PRs. Running the smoke test again, since it should have been cleared up based on comments I see in other PRs.

@abertelrud
Copy link
Contributor Author

@swift-ci please smoke test

@tomerd
Copy link
Contributor

tomerd commented Jul 16, 2021

@swift-ci test

@abertelrud
Copy link
Contributor Author

Looks like the smoke test is using swift-argument-parser 0.4.1 but swift-package-manager needs 0.4.3. But that's not a new requirement in this PR. That was added in 1a361f7 on July 8.

@shahmishal or @neonichu do you know why the smoke test here used 0.4.1? Or to whom would I need to talk to get that updated?

I this case I think that as long as the full test passes, we can merge, since the smoke test isn't required and the failure is a configuration and not a code issue. But it would be good to update the swift-argument-parser version that's used.

@abertelrud
Copy link
Contributor Author

@swift-ci please smoke test

…eful to have them in packages without warnings

Unlike other Xcode-specific file types, such as Storyboards and Asset Catalogs, the .docc bundles are not needed for correctness during the build, and should therefore not trigger warnings.

rdar://78133445

(cherry picked from commit 8f9e5d3 and f39a8be)
@abertelrud
Copy link
Contributor Author

@swift-ci please test

@abertelrud
Copy link
Contributor Author

Updated with the refinement in #3620.

@abertelrud abertelrud merged commit 6e191c9 into swiftlang:release/5.5 Jul 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready Author believes the PR is ready to be merged & any feedback has been addressed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants