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

Make the macOS regex allow macosx #80

Merged
merged 1 commit into from
Dec 23, 2024

Conversation

kattouf
Copy link
Contributor

@kattouf kattouf commented Dec 17, 2024

When using build triple names for release assets, there is an issue with macOS assets because the OS name in Swift’s build triples is macosx instead of macos.

Sources for reference:
List of possible triples in Swift tests
Article on building Swift executables using triples
Example of assets named by triples

ubi/src/os.rs Outdated Show resolved Hide resolved
@autarch
Copy link
Member

autarch commented Dec 18, 2024

Hi, thanks for your PR! I'm pretty finicky about my projects (see this blog post for details), so I rarely merge a PR as-is. I can move forward on your PR in one of two ways:

  1. I check it out locally, fiddle with it as needed, merge it locally, and simply close this PR. This will preserve at least one commit with your name on it, but the PR will show up as closed in your GitHub stats.
  2. If you enable me to push directly to your fork, I can do my fiddling, then force push to your fork and merge the resulting PR. Again, this will preserve at least one commit with your name on it, but you also get credit for the PR merge in your GitHub stats. The only downside is that I will be force pushing directly to your fork.

Please let me know which approach you'd prefer. If I don't hear from you before I get around to working on this PR I'll go with option 1.

Thanks again for your contribution!

@kattouf
Copy link
Contributor Author

kattouf commented Dec 19, 2024

Hi! This PR contains a small amount of work, so I believe the first option works well. Feel free to handle it in a way that’s most convenient for you. 👌

UPD:
I’ve also given you access to my forked edits, if that works better for you.

@autarch autarch force-pushed the feat/support-macosx-os-names branch from defd597 to bfa308d Compare December 23, 2024 15:31
ubi/src/os.rs Outdated Show resolved Hide resolved
@autarch autarch changed the title feat: support macosx os names Make the macOS regex allow macosx Dec 23, 2024
@autarch autarch merged commit 78c5371 into houseabsolute:master Dec 23, 2024
30 checks passed
@autarch
Copy link
Member

autarch commented Dec 23, 2024

Thanks again for the PR!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants