ci: select x86_64 asset when upstream ships multi-arch releases#544
Open
OptimoSupreme wants to merge 1 commit into
Open
ci: select x86_64 asset when upstream ships multi-arch releases#544OptimoSupreme wants to merge 1 commit into
OptimoSupreme wants to merge 1 commit into
Conversation
GE-Proton publishes an -aarch64 build alongside the x86_64 one starting with v11. The asset-selection loop in pull-components.yml stops at the first asset matching <name-prefix>...[0-9]+<name-suffix>.tar.*, and the aarch64 tarball is returned first, so the importer picked GE-Proton11-1-aarch64.tar.gz -- the wrong architecture (see bottlesdevs#542). The x86_64 build keeps the legacy unsuffixed name (GE-Proton11-1.tar.gz), so a name-suffix filter cannot select it. Skip aarch64/arm64 assets in the loop instead so it falls through to the x86_64 build. This also future-proofs the identically-configured wine-ge-custom row.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Problem
Fix for #542 Since GE-Proton11-1, GloriousEggroll publishes an
-aarch64build alongsidethe x86_64 one on each release. The asset-selection loop in
pull-components.ymlstops at the first asset matching<name-prefix>...[0-9]+<name-suffix>.tar.*, and the aarch64 tarball isreturned first, so the importer selects
GE-Proton11-1-aarch64.tar.gz— thewrong architecture. This is what's currently blocking #542 (flagged there by
@jntesteves).
Why not a
-x86_64name-suffixThe x86_64 build keeps the legacy unsuffixed name (
GE-Proton11-1.tar.gz);there is no
-x86_64asset to match, so adding a suffix would break selectionwith "Cannot find a corresponding asset name."
Fix
Skip
aarch64/arm64assets in the selection loop so it falls through to thex86_64 build. Bottles only ships x86_64 runners, so this is safe, and it also
future-proofs the identically-configured
wine-ge-customrow.Verification
Simulated the loop against the real GE-Proton11-1 asset list:
GE-Proton11-1-aarch64.tar.gzGE-Proton11-1.tar.gzRegression-checked single-asset (GE-Proton10-34),
-x86_64-suffixed (CachyOS),and arch-less (dxvk) rows, all of which are unchanged.
Once merged, the next scheduled
pull-componentsrun will regenerate theGE-Proton11 entry in #542 with the correct x86_64 asset.