Skip to content

repair build after #32903 #33066

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

Closed
wants to merge 1 commit into from
Closed

repair build after #32903 #33066

wants to merge 1 commit into from

Conversation

compnerd
Copy link
Member

Repair the Windows build after #32903

Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.

Resolves SR-NNNN.

@compnerd
Copy link
Member Author

compnerd commented Jul 23, 2020

CC: @artemcm @nkcsgexi

@compnerd
Copy link
Member Author

@swift-ci please smoke test

// RUN: echo "}," >> %/t/inputs/map.json
// RUN: echo "{" >> %/t/inputs/map.json
// RUN: echo "\"moduleName\": \"SwiftOnoneSupport\"," >> %/t/inputs/map.json
// RUN: echo "\"modulePath\": \"%ononesupport_module\"," >> %/t/inputs/map.json
// RUN: echo "\"modulePath\": \"%/ononesupport_module\"," >> %/t/inputs/map.json
Copy link
Contributor

@artemcm artemcm Jul 23, 2020

Choose a reason for hiding this comment

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

This fix is missing the removal of the comma after the last object element that I had in the other PR.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah, good point. That is optional - I can add it or it can be a follow up. The reason that it is not needed is because the list itself contains objects. Objects can have trailing commas.

Copy link
Contributor

@artemcm artemcm left a comment

Choose a reason for hiding this comment

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

Thank you, @compnerd.
Sorry for the trouble.

@artemcm
Copy link
Contributor

artemcm commented Jul 23, 2020

lit.cfg:1444 needs to be:
if platform.system() == 'Linux' or platform.system() == 'Windows':

Repair the Windows build after swiftlang#32903
@compnerd
Copy link
Member Author

Bleh, adjusted. Thanks @artemcm

@compnerd
Copy link
Member Author

@swift-ci please smoke test

@compnerd
Copy link
Member Author

@swift-ci please test windows platform

@artemcm
Copy link
Contributor

artemcm commented Jul 23, 2020

@compnerd, if this takes a while or there are any hiccups, in the interest of unblocking the Windows build, #33062 incorporates the same fix and is ready to merge, feel free to use either.

@compnerd
Copy link
Member Author

Oh,nice, let's go with that since it's ready!

@compnerd compnerd closed this Jul 23, 2020
@compnerd compnerd deleted the 32903 branch July 23, 2020 05:50
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