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

Replace --ignore-if-missing with local file check #184

Merged
merged 4 commits into from
Feb 26, 2025

Conversation

xtremekforever
Copy link
Contributor

@xtremekforever xtremekforever commented Feb 14, 2025

This fixes #181.

Tested this locally by building SDKs. It works for building the SDK for armv7 using my build artifacts:

swift run swift-sdk-generator make-linux-sdk --swift-version 6.0.3-RELEASE --host x86_64-unknown-linux-gnu --target armv7-unknown-linux-gnueabihf --target-swift-package-path ~/Downloads/swift-6.0.3-RELEASE-ubuntu-jammy-armv7-install

And also building an SDK for aarch64 using official swift.org artifacts:

swift run swift-sdk-generator make-linux-sdk --swift-version 6.0.3-RELEASE --host x86_64-unknown-linux-gnu --target aarch64-unknown-linux-gnu

@MaxDesiatov @euanh

 - optional is also a keyword
@MaxDesiatov
Copy link
Contributor

@swift-ci test

@MaxDesiatov MaxDesiatov changed the title Fix #138 by replacing --ignore-if-missing with local file check for optional paths in target swift package Replace --ignore-if-missing with local file check Feb 16, 2025
@MaxDesiatov
Copy link
Contributor

@swift-ci test

@MaxDesiatov MaxDesiatov requested a review from euanh February 16, 2025 01:44
Copy link
Contributor

@MaxDesiatov MaxDesiatov left a comment

Choose a reason for hiding this comment

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

Seems reasonable to me, would be great get a review from Euan before merging.

@xtremekforever
Copy link
Contributor Author

I did confirm this works fine on my MacBook Pro, but would be good to double check on another machine as well :)

Copy link
Contributor

@euanh euanh left a comment

Choose a reason for hiding this comment

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

This fixes #138.

This PR is linked to #138 but I think it should be linked to #181

@xtremekforever
Copy link
Contributor Author

Oops my bad. I updated the description. The PR is against #181 so I just fat fingered the description.

@xtremekforever xtremekforever requested a review from euanh February 25, 2025 17:30
@MaxDesiatov
Copy link
Contributor

@swift-ci test

@MaxDesiatov MaxDesiatov merged commit 7145887 into swiftlang:main Feb 26, 2025
3 checks passed
@xtremekforever xtremekforever deleted the #181-fix-rsync-macos branch February 26, 2025 11:20
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.

rsync on macOS does not support the --ignore-missing-args option
3 participants