Skip to content

Commit

Permalink
CI: add support for Conda osx_arm64 builds
Browse files Browse the repository at this point in the history
Now that
https://github.com/conda-incubator/setup-miniconda/releases/tag/v3.0.2
has been released with support for them

(port similar changes from
OSGeo/gdal@fe693c6)
  • Loading branch information
rouault committed Feb 25, 2024
1 parent a9d5165 commit 884fa0e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
fail-fast: true
matrix:
platform: ['windows-latest','macos-latest','ubuntu-latest']
platform: ['windows-latest','macos-latest','macos-14','ubuntu-latest']

env:
PDAL_PLATFORM: ${{ matrix.platform }}
Expand Down
12 changes: 9 additions & 3 deletions scripts/ci/conda/compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,24 @@ mkdir packages
export CI_PLAT=""
if grep -q "windows" <<< "$PDAL_PLATFORM"; then
CI_PLAT="win"
ARCH="64"
fi

if grep -q "ubuntu" <<< "$PDAL_PLATFORM"; then
CI_PLAT="linux"
ARCH="64"
fi

if grep -q "macos" <<< "$PDAL_PLATFORM"; then
if grep -q "macos-14" <<< "$PDAL_PLATFORM"; then
CI_PLAT="osx"
ARCH="arm64"
elif grep -q "macos" <<< "$PDAL_PLATFORM"; then
CI_PLAT="osx"
ARCH="64"
fi

conda build recipe --clobber-file recipe/recipe_clobber.yaml --output-folder packages -m ".ci_support/${CI_PLAT}_64_.yaml"
conda create -y -n test -c ./packages/$CI_PLAT-64 python pdal
conda build recipe --clobber-file recipe/recipe_clobber.yaml --output-folder packages -m ".ci_support/${CI_PLAT}_${ARCH}_.yaml"
conda create -y -n test -c ./packages/${CI_PLAT}-${ARCH} python pdal
conda deactivate

conda activate test
Expand Down

0 comments on commit 884fa0e

Please sign in to comment.