diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 006a061..05d84fc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -42,7 +42,8 @@ jobs: matrix: os: - ubuntu-22.04 - - macos-12 + - macos-12 # x86_64 + - macos-14 # arm64 name: build and test (os=${{ matrix.os }}) runs-on: ${{ matrix.os }} @@ -87,6 +88,10 @@ jobs: - name: Generate summary run: | + if [[ "$(uname -m)" == "arm64" ]]; then + echo "Skip on arm64 until the package is published" >&2 + exit 0 + fi ./devel/download-latest ./devel/diff-pkgs nextstrain-base-*.conda build/locked/*/nextstrain-base-*.conda \ > "$GITHUB_STEP_SUMMARY" diff --git a/README.md b/README.md index 1ff86fe..0ad9ad0 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ To build this package locally, run: The final built package will be written to `build/locked//nextstrain-base-*.conda`, where `` is a Conda -subdir, e.g. `linux-64` or `osx-64`. +subdir, i.e. `linux-64`, `osx-64` or `osx-arm64`. [CI][] builds store the entire `build/` and `locked/` directories as an artifact attached to each CI run. You can download the artifacts to inspect diff --git a/devel/build b/devel/build index 2c4f866..198b17a 100755 --- a/devel/build +++ b/devel/build @@ -11,12 +11,6 @@ main() { export PATH="$env/bin:$PATH" export VERSION="${VERSION:-$(./devel/generate-version)}" - # Set CONDA_SUBDIR unless it's already set. This helps macOS users on - # arm64 chips use and produce osx-64 Conda packages instead of osx-arm64 - # packages (which we don't yet support). - CONDA_SUBDIR="${CONDA_SUBDIR:-$(./devel/conda-subdir)}" - export CONDA_SUBDIR - clean build src lock diff --git a/devel/conda-subdir b/devel/conda-subdir index 1ea9037..52b51c0 100755 --- a/devel/conda-subdir +++ b/devel/conda-subdir @@ -15,7 +15,7 @@ case "$kernel/$machine" in echo "osx-64";; Darwin/arm64) - echo "osx-64";; + echo "osx-arm64";; *) echo "unsupported kernel/machine: $kernel/$machine" >&2 diff --git a/src/recipe.yaml b/src/recipe.yaml index 45680d0..5eb7bce 100644 --- a/src/recipe.yaml +++ b/src/recipe.yaml @@ -46,6 +46,7 @@ requirements: - nextclade - nextstrain-cli - pathogen-embed + - pango_aliasor # # Third-party @@ -73,12 +74,12 @@ requirements: - iqtree >=2 - jq - ncbi-datasets-cli - - pango_aliasor - perl - # Pin pulp <2.8 for snakemake: https://github.com/snakemake/snakemake/issues/2607 + # Pin pulp <2.8 for snakemake: https://github.com/snakemake/snakemake/issues/2607 - pulp <2.8 - ruby - seqkit + # TODO: We should avoid pinning too long, this pin was placed in 2023-12-21 - snakemake <8 - tsv-utils - unzip