Skip to content

[5.3] Enhance fixup target to use plutil and get correct xctest path #674

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
Jun 11, 2020

Conversation

edymtt
Copy link
Contributor

@edymtt edymtt commented Jun 10, 2020

There are two reason to use plutil

  • defaults will no longer support this in the future, as per man page

WARNING: The defaults command will be changed in an upcoming major
release to only operate on preferences domains. General plist
manipulation utilities will be folded into a different command-line
program.

  • plutil prints more meaningful errors that help in troubleshooting CI
    issues

Indeed this switch helped uncover an issue with the logic inferring the
path of XcodePerfTests.xctest.

Addresses rdar://63984731

(cherry picked from commit 145c113, #673)

There are two reason to use plutil

* defaults will no longer support this in the future, as per man page

> WARNING: The defaults command will be changed in an upcoming major
release to only operate on preferences domains. General plist
manipulation utilities will be folded into a different command-line
program.

* plutil prints more meaningful errors that help in troubleshooting CI
issues

Indeed this switch helped uncover an issue with the logic inferring the
path of XcodePerfTests.xctest.

Addresses rdar://63984731

(cherry picked from commit 145c113,
@edymtt edymtt requested review from ddunbar and dmbryson as code owners June 10, 2020 21:15
@edymtt
Copy link
Contributor Author

edymtt commented Jun 10, 2020

@swift-ci please smoke test

@edymtt edymtt changed the base branch from master to release/5.3 June 10, 2020 21:18
@edymtt
Copy link
Contributor Author

edymtt commented Jun 10, 2020

@swift-ci please smoke test

@edymtt
Copy link
Contributor Author

edymtt commented Jun 10, 2020

(I would need to restart the PR testing later, as I initially selected by mistake master instead of release/5.3)

@edymtt
Copy link
Contributor Author

edymtt commented Jun 10, 2020

@swift-ci please smoke test

edymtt pushed a commit to edymtt/swift that referenced this pull request Jun 11, 2020
We were accidentally using the system libicu instead of building it,
causing version mismatches.

This will unblock Linux PR testing for
swiftlang/swift-llbuild#674

(cherry picked from commit ccb41f0,
 swiftlang#31733)
@edymtt
Copy link
Contributor Author

edymtt commented Jun 11, 2020

Please test with following pull request:
swiftlang/swift#32316

@swift-ci Please smoke test Linux platform

edymtt added a commit to swiftlang/swift that referenced this pull request Jun 11, 2020
)

We were accidentally using the system libicu instead of building it,
causing version mismatches.

This will unblock Linux PR testing for
swiftlang/swift-llbuild#674

(cherry picked from commit ccb41f0,
 #31733)

Co-authored-by: Ben Langmuir <[email protected]>
@edymtt edymtt merged commit 42a7c64 into swiftlang:release/5.3 Jun 11, 2020
@edymtt edymtt deleted the prefer_plutil_to_defaults_5_3 branch June 11, 2020 19:01
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