Skip to content

Conversation

@poya
Copy link

@poya poya commented Aug 30, 2021

Honor some previously ignored diagnostic options like
'-debug-diagnostic-names' and '-locale' by applying them to the
diagnostic engine in the SwiftASTContext.

https://bugs.swift.org/browse/SR-14845

@poya
Copy link
Author

poya commented Aug 30, 2021

@swift-ci please test

@poya
Copy link
Author

poya commented Aug 31, 2021

@adrian-prantl @augusto2112
Based on recent git history to the edited files perhaps you could have a look at this, whether it's a reasonable fix and swift/main is the correct branch for it?
It looks like the ci-bot doesn't listen to me, so couldn't get the build checks triggered myself.

Copy link

@augusto2112 augusto2112 left a comment

Choose a reason for hiding this comment

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

Thanks a lot for doing this! I've left 2 nits, but it looks great. Could you open a PR targeting stable/20210726?

@augusto2112
Copy link

@swift-ci test

@poya
Copy link
Author

poya commented Aug 31, 2021

Could you open a PR targeting stable/20210726?

Switch the target branch for this PR or a new separate PR for stable/20210726?

@augusto2112
Copy link

Either way is fine!

@poya
Copy link
Author

poya commented Aug 31, 2021

If the change ends up in the stable branch only, approximately how long would it take before it gets automerged into swift/main which I guess is a requirement to resolve the attached ticket?

@augusto2112
Copy link

It's not a requirement to land this on swift/main to solve the ticket, once this is done, you can mark it as solved. We're landing all the lldb changes on stable/20210726 for now.

@poya poya changed the base branch from swift/main to stable/20210726 September 1, 2021 01:25
@poya
Copy link
Author

poya commented Sep 1, 2021

Changed the target branch to stable/20210726

Thanks for your review and the info around branching

@poya poya requested a review from augusto2112 September 2, 2021 01:52
Honor some previously ignored diagnostic options like
'-debug-diagnostic-names' and '-locale' by applying them to the
diagnostic engine in the SwiftASTContext.

https://bugs.swift.org/browse/SR-14845
@poya
Copy link
Author

poya commented Sep 8, 2021

@augusto2112 Do you mind helping getting this merged now that the target branch has been updated?

@augusto2112
Copy link

@swift-ci test

@augusto2112
Copy link

@poya sorry, I think we'll have to wait a bit longer until this branch is stable enough to run the CI tests 😞

@augusto2112
Copy link

@swift-ci test

@augusto2112
Copy link

I ran the test suite locally and verified this doesn't break anything.

@augusto2112 augusto2112 merged commit 621d7d9 into swiftlang:stable/20210726 Sep 24, 2021
@augusto2112
Copy link

@poya thanks for doing this and sorry for the delay!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants