feat: match artifacts with "arm" in package name on macOS ARM64 #132
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
itochan
commented
Aug 10, 2025
| return Ok(matches.remove(0)); | ||
| } | ||
|
|
||
| let filtered = self.maybe_filter_for_64_bit_arch(matches); |
Contributor
Author
There was a problem hiding this comment.
Without changing the filter order, "arm" will be excluded because it doesn't contain the string "64".
Member
|
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. For larger PRs, I typically use the GitHub PR review process and provide feedback directly on the code, asking you to make some changes. For smaller PRs, where I just want to tweak some small stuff (like doc wording, comments, code formatting, etc.), I don't do a PR review. Whether or not I do a review, there are two options for merging the PR:
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! |
Contributor
Author
|
I'd prefer option 2. Thank you. |
…x86-64" Previously, we would pick the x86-64 artifact because we looked for 64-bit names, but on macOS ARM we should prefer plain "arm" over "x86-64".
autarch
force-pushed
the
improve-matching-for-macos-aarch64
branch
from
ccdb32f to
dd0fd09
Compare
autarch
approved these changes
Aug 23, 2025
Member
autarch
left a comment
autarch
left a comment
There was a problem hiding this comment.
I made a few tweaks and I will merge it once CI passes.
Member
|
Thanks for this! It'll be in the next release. |
prashantv
added a commit
to prashantv/ubi
that referenced
this pull request
Oct 9, 2025
Fixes houseabsolute#137 The picker logic for macos arm was reordered in houseabsolute#132 to return on a match, but this was done before checking against the `--matching` filter. Move up the check against `--matching` so it's not ignored.
prashantv
added a commit
to prashantv/ubi
that referenced
this pull request
Oct 9, 2025
Fixes houseabsolute#137 The picker logic for macos arm was reordered in houseabsolute#132 to return on a match, but this was done before checking against the `--matching` filter. Instead, filter matches against `--matching` before architecture matching.
autarch
pushed a commit
to prashantv/ubi
that referenced
this pull request
Oct 11, 2025
The picker logic for macos arm was reordered in houseabsolute#132 to return on a match, but this was done before checking against the `--matching` filter. This fixes the picker code so that it filters assets against `--matching` before architecture matching.
autarch
pushed a commit
to prashantv/ubi
that referenced
this pull request
Oct 11, 2025
The picker logic for macos arm was reordered in houseabsolute#132 to return on a match, but this was done before checking against the `--matching` filter. This fixes the picker code so that it filters assets against `--matching` before architecture matching.
autarch
pushed a commit
that referenced
this pull request
Oct 11, 2025
The picker logic for macos arm was reordered in #132 to return on a match, but this was done before checking against the `--matching` filter. This fixes the picker code so that it filters assets against `--matching` before architecture matching.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR improves the asset selection logic for macOS Apple Silicon (ARM64) systems to better handle asset names that contain "arm" (without "64" suffix) such as "dcm-macos-arm-release.zip".
I only modified
macos_aarch64_re()and didn't changeaarch64_re()because there's a risk of incorrectly selecting 32-bit binaries on non-macOS ARM64 environments.Since all ARM environments on macOS are 64-bit, I believe this change will work correctly.
Note: I have contributed to this repository in the past. I allow edits to this branch and commits.