Skip to content
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

Package.swift: bump ArgumentParser to 1.1.4 #1218

Merged
merged 2 commits into from
Jan 10, 2023
Merged

Package.swift: bump ArgumentParser to 1.1.4 #1218

merged 2 commits into from
Jan 10, 2023

Conversation

MaxDesiatov
Copy link
Contributor

No description provided.

@MaxDesiatov
Copy link
Contributor Author

@swift-ci please test with the following PRs
swiftlang/swift#59009
swiftlang/swift-package-manager#5884

@artemcm
Copy link
Contributor

artemcm commented Nov 7, 2022

@MaxDesiatov this repository does not support cross-repo CI.
Instead, it should be launched from apple/swift with the mention of this PR.

@MaxDesiatov
Copy link
Contributor Author

Fair enough, thanks for the guidance 👍

@MaxDesiatov

This comment was marked as duplicate.

@MaxDesiatov MaxDesiatov changed the title Package.swift: bump ArgumentParser to 1.1.4 Package.swift: bump ArgumentParser to 1.2.0 Nov 10, 2022
@MaxDesiatov

This comment was marked as duplicate.

@MaxDesiatov MaxDesiatov changed the title Package.swift: bump ArgumentParser to 1.2.0 Package.swift: bump ArgumentParser to 1.1.4 Nov 30, 2022
@MaxDesiatov

This comment was marked as duplicate.

@MaxDesiatov
Copy link
Contributor Author

@swift-ci please test

@MaxDesiatov

This comment was marked as duplicate.

1 similar comment
@MaxDesiatov
Copy link
Contributor Author

@swift-ci please test Windows

@@ -333,9 +333,8 @@ def install_libraries(args, build_dir, universal_lib_dir, toolchain_lib_dir, tar

# Install the swift-argument-parser shared libraries into the toolchain lib
package_subpath = os.path.join(args.configuration, 'dependencies', 'swift-argument-parser')
for lib in ['libArgumentParser', 'libArgumentParserToolInfo']:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@DougGregor this is a change I have doubts about, but it apparently makes the error in this CI run go away: https://ci.swift.org/job/swift-PR-macos/5203/console

@MaxDesiatov
Copy link
Contributor Author

@swift-ci please test

@MaxDesiatov
Copy link
Contributor Author

@swift-ci please test

@MaxDesiatov
Copy link
Contributor Author

@swift-ci please test

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.

Looks good. Thanks for the extension fixes to build-script-helper.py

@MaxDesiatov
Copy link
Contributor Author

@swift-ci please test

@rauhul
Copy link
Member

rauhul commented Jan 4, 2023

Just wondering, any reason to not pull in 1.2.0?

@CodaFi CodaFi requested a review from compnerd January 4, 2023 04:48
@MaxDesiatov
Copy link
Contributor Author

There's a regression in 1.2.0 due to which SwiftPM bootstrap build fails.

@MaxDesiatov
Copy link
Contributor Author

@swift-ci test Windows

@compnerd
Copy link
Member

compnerd commented Jan 4, 2023

Bleh, the windows failure looks like a regression in LSP (wonder if the windows build got triggered on changes 🤔)

Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

Windows does a shared link to s-a-p. We should bump this in swift in update-checkout-config.json and in the other packages (SPM, LSP).

@MaxDesiatov
Copy link
Contributor Author

MaxDesiatov commented Jan 4, 2023

It has been bumped in all other places, I have corresponding PRs waiting to be merged. Do you expect any additional changes to this PR specifically?

@compnerd
Copy link
Member

compnerd commented Jan 4, 2023

Please test with following PRs:
swiftlang/sourcekit-lsp#689

@swift-ci please test Windows platform

@MaxDesiatov
Copy link
Contributor Author

I've been told upthread that this repository doesn't support cross-repo testing, but I hope that Windows CI run passes anyway

@MaxDesiatov
Copy link
Contributor Author

@swift-ci test Windows

@MaxDesiatov
Copy link
Contributor Author

@compnerd Windows build is passing now, would you mind re-reviewing? Thanks!

Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

The change itself looks fine, but please make sure that you do a cross-repo test in apple/swift with @swift-ci please build toolchain Windows platform and then test the resulting installer. The problem is that there can be something subtle in the packaging where a dependency is either missing and expected or is missing and unexpected and the tools will not function.

@MaxDesiatov
Copy link
Contributor Author

@compnerd thank you. I've pinged you in the corresponding PR, for some reason the Windows toolchain CI run can't find artifacts, even though there are no obvious failures. I've shared the error message here swiftlang/swift#59009 (comment)

@compnerd
Copy link
Member

compnerd commented Jan 5, 2023

@MaxDesiatov - that is what happens when the necessary changes are missing! You need a parallel change to apple/swift-installer-scripts: swiftlang/swift#59009 (review)

@MaxDesiatov
Copy link
Contributor Author

That did indeed help, thanks for the review and finding the root cause of the build failure!

@shahmishal shahmishal merged commit 481f710 into swiftlang:main Jan 10, 2023
@MaxDesiatov MaxDesiatov deleted the maxd/bump-argumentparser branch January 10, 2023 09:09
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.

5 participants