Skip to content

Revert JSON format change and fix bug introduced by #3696 #3793

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
Oct 6, 2021

Conversation

finagolfin
Copy link
Member

Motivation: The larger refactoring changed the destination JSON format and introduced a bug in passing flags.

Changes: Use a CodingKeys enum to go back to the old format and correct the flag error.

I had to modify the destination JSON format that I use on my Android CI because of this format change, and the flag bug broke using trunk SPM with a destination JSON for NIO SSL, so I had to roll back to 5.5 SPM instead.

There is currently no test that would catch these JSON issues, so I will submit one separately in a subsequent pull, but I'd like to quickly get these fixes in in the meantime. It will take longer for me to learn the testing infrastructure enough to add that test.

Motivation: The larger refactoring changed the destination JSON format and
introduced a bug in passing flags.

Changes: Use a CodingKeys enum to go back to the old format and correct the flag
error.
@neonichu
Copy link
Contributor

neonichu commented Oct 6, 2021

@swift-ci please smoke test

@tomerd tomerd added the ready Author believes the PR is ready to be merged & any feedback has been addressed label Oct 6, 2021
@tomerd
Copy link
Contributor

tomerd commented Oct 6, 2021

thanks for the catch + fix @buttaface will merge once CI goes green

@tomerd tomerd merged commit 2f781b4 into swiftlang:main Oct 6, 2021
@finagolfin finagolfin deleted the json branch October 10, 2021 05:00
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