Skip to content

Add build for osx-arm64 - #80

Merged
victorlin merged 4 commits into
mainfrom
arm
Feb 5, 2025
Merged

victorlin merged 4 commits into
mainfrom
arm

Conversation

@corneliusroemer

@corneliusroemer corneliusroemer commented Jul 12, 2024 •

Copy link
Copy Markdown
Member

Description of proposed changes

Build conda-base for osx-arm64 as well.

Related issue(s)

Resolves #77

Checklist

@corneliusroemer
corneliusroemer marked this pull request as ready for review July 12, 2024 15:04
@corneliusroemer
corneliusroemer requested a review from tsibley July 12, 2024 15:04
Comment thread .github/workflows/ci.yaml Outdated
Comment thread src/recipe.yaml Outdated
victorlin
victorlin previously approved these changes Jul 16, 2024

@victorlin victorlin left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good pending cleanup of commits or squash+merge on GitHub

Comment thread src/recipe.yaml Outdated
Comment thread src/recipe.yaml Outdated
@corneliusroemer
corneliusroemer requested a review from tsibley July 18, 2024 17:53
@corneliusroemer

corneliusroemer commented Jul 18, 2024 •

Copy link
Copy Markdown
Member Author

Will take a few minutes for gzip arm64 to become available, rerun later then it should work

Update: it works

@corneliusroemer

Copy link
Copy Markdown
Member Author

@victorlin

Looks good pending cleanup of commits or squash+merge on GitHub

I will squash :)

@corneliusroemer corneliusroemer changed the title Attempt to build for osx-arm64 feat: Make osx-arm64 version of conda-base Jul 22, 2024
@victorlin

Copy link
Copy Markdown
Member

I'm picking this up since I'd like to run MAFFT natively on my M1 Mac and this would be a proper way to allow that in managed runtimes.

corneliusroemer and others added 2 commits February 4, 2025 15:59
The osx-arm64 build of unzip provided by conda cannot extract the info
file from the conda package. The error is apparent when running with
unzip directly:

    skipping: info-nextstrain-base-20250203T230808Z-h60d57d3_0.tar.zst  need PK compat. v4.5 (can do v2.1)

p7zip does not have this issue.
@victorlin

Copy link
Copy Markdown
Member

I've gathered and dropped what seems to be unnecessary changes as 3fc1f03. Changes are minimal now and this is ready for re-review.

@victorlin victorlin self-assigned this Feb 5, 2025
@victorlin victorlin changed the title feat: Make osx-arm64 version of conda-base Add build for osx-arm64 Feb 5, 2025
@victorlin
victorlin dismissed stale reviews from tsibley and themself February 5, 2025 00:15

new changes

@tsibley tsibley left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks good to me. I pushed two commits as an alternative to the temporary commit (see comment); take it or leave it!

Comment thread .github/workflows/ci.yaml Outdated
It seems unnecessary to tank the build just because we fail to generate
a package diff.
Avoids letting the issue surface as more distant and perplexing errors
in jq and wget.
@victorlin
victorlin merged commit d7d23af into main Feb 5, 2025
@victorlin
victorlin deleted the arm branch February 5, 2025 18:04
tsibley added a commit to nextstrain/cli that referenced this pull request May 15, 2025
When supported, new setups will get osx-arm64 instead of osx-64 and
existing setups will be upgraded from osx-64 → osx-arm64.  If the
version of nextstrain-base that's being installed/upgraded (or more
likely, downgraded to) to does not have an osx-arm64 build, then an
osx-64 build will be used instead (provided Rosetta 2 is enabled).

Co-authored-by: Victor Lin <13424970+victorlin@users.noreply.github.com>
Related-to: <#379>
Related-to: <nextstrain/conda-base#80>
tsibley added a commit to nextstrain/cli that referenced this pull request May 15, 2025
When supported, new setups will get osx-arm64 instead of osx-64 and
existing setups will be upgraded from osx-64 → osx-arm64.  If the
version of nextstrain-base that's being installed/upgraded (or more
likely, downgraded to) to does not have an osx-arm64 build, then an
osx-64 build will be used instead (provided Rosetta 2 is enabled).

Co-authored-by: Victor Lin <13424970+victorlin@users.noreply.github.com>
Related-to: <#379>
Related-to: <nextstrain/conda-base#80>
tsibley added a commit to nextstrain/cli that referenced this pull request May 19, 2025
When supported, new setups will get osx-arm64 instead of osx-64 and
existing setups will be upgraded from osx-64 → osx-arm64.  If the
version of nextstrain-base that's being installed/upgraded (or more
likely, downgraded to) to does not have an osx-arm64 build, then an
osx-64 build will be used instead (provided Rosetta 2 is enabled).

Co-authored-by: Victor Lin <13424970+victorlin@users.noreply.github.com>
Related-to: <#379>
Related-to: <nextstrain/conda-base#80>
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.

ENH: Support native osx-arm64 conda install

3 participants