More WIP, introduce tentative osx arm64 builds.

bluescarni · Dec 17, 2024 · 558f486 · 558f486
1 parent f47b0f2
commit 558f486
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,8 +11,8 @@ jobs:
         name: Build and test
         command: bash ./tools/conda_docs.sh
         environment:
-          PY_VERSION: "3.12"
-          CONDA_ARCH: "Linux-x86_64"
+          HEYOKA_PY_PY_VERSION: "3.12"
+          HEYOKA_PY_CONDA_ARCH: "Linux-x86_64"
   conda_arm64_heyoka_head_312:
     machine:
       image: ubuntu-2204:current
@@ -23,8 +23,8 @@ jobs:
         name: Build and test
         command: bash ./tools/conda_docs.sh
         environment:
-          PY_VERSION: "3.12"
-          CONDA_ARCH: "Linux-aarch64"
+          HEYOKA_PY_PY_VERSION: "3.12"
+          HEYOKA_PY_CONDA_ARCH: "Linux-aarch64"
 
 workflows:
   version: 2.1

diff --git a/.github/workflows/gh_actions_ci.yml b/.github/workflows/gh_actions_ci.yml
@@ -21,14 +21,38 @@ jobs:
       - uses: actions/checkout@v4
       - name: Build
         run: bash tools/gha_conda_static.sh
-  osx_heyoka_head:
+  osx_heyoka_head_x86_64:
+    runs-on: macos-latest-large
+    env:
+      HEYOKA_PY_PY_VERSION: "3.12"
+      HEYOKA_PY_CONDA_ARCH: "MacOSX-x86_64"
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build
+        run: bash tools/gha_osx_heyoka_head.sh
+  osx_heyoka_head_x86_64_static:
+    runs-on: macos-latest-large
+    env:
+      HEYOKA_PY_PY_VERSION: "3.12"
+      HEYOKA_PY_CONDA_ARCH: "MacOSX-x86_64"
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build
+        run: bash tools/gha_osx_heyoka_head_static.sh
+  osx_heyoka_head_arm64:
     runs-on: macos-latest
+    env:
+      HEYOKA_PY_PY_VERSION: "3.12"
+      HEYOKA_PY_CONDA_ARCH: "MacOSX-arm64"
     steps:
       - uses: actions/checkout@v4
       - name: Build
         run: bash tools/gha_osx_heyoka_head.sh
-  osx_heyoka_head_static:
+  osx_heyoka_head_arm64:
     runs-on: macos-latest
+    env:
+      HEYOKA_PY_PY_VERSION: "3.12"
+      HEYOKA_PY_CONDA_ARCH: "MacOSX-arm64"
     steps:
       - uses: actions/checkout@v4
       - name: Build

diff --git a/tools/conda_docs.sh b/tools/conda_docs.sh
@@ -10,11 +10,11 @@ set -e
 sudo apt-get install wget
 
 # Install conda+deps.
-wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-${CONDA_ARCH}.sh -O miniforge.sh
+wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-${HEYOKA_PY_CONDA_ARCH}.sh -O miniforge.sh
 export deps_dir=$HOME/local
 export PATH="$HOME/miniforge/bin:$PATH"
 bash miniforge.sh -b -p $HOME/miniforge
-conda create -y -p $deps_dir c-compiler cxx-compiler python=${PY_VERSION} git pybind11 \
+conda create -y -p $deps_dir c-compiler cxx-compiler python=${HEYOKA_PY_PY_VERSION} git pybind11 \
     ninja 'numpy>=2' mpmath cmake llvmdev tbb-devel tbb astroquery libboost-devel \
     'mppp=2.*' sleef fmt skyfield spdlog myst-nb matplotlib sympy scipy pykep cloudpickle \
     'sphinx=7.*' 'sphinx-book-theme=1.*'

diff --git a/tools/gha_osx_heyoka_head.sh b/tools/gha_osx_heyoka_head.sh
@@ -7,11 +7,11 @@ set -x
 set -e
 
 # Install conda+deps.
-wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-MacOSX-x86_64.sh -O miniconda.sh
+wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-${HEYOKA_PY_CONDA_ARCH}.sh -O miniconda.sh
 export deps_dir=$HOME/local
 export PATH="$HOME/miniconda/bin:$PATH"
 bash miniconda.sh -b -p $HOME/miniconda
-conda create -y -p $deps_dir python=3.11 c-compiler cxx-compiler git pybind11 'numpy>=2' \
+conda create -y -p $deps_dir python=${HEYOKA_PY_PY_VERSION} c-compiler cxx-compiler git pybind11 'numpy>=2' \
     ninja cmake llvmdev tbb-devel tbb astroquery libboost-devel sleef fmt skyfield \
     spdlog sympy cloudpickle 'mppp=2.*'
 source activate $deps_dir

diff --git a/tools/gha_osx_heyoka_head_static.sh b/tools/gha_osx_heyoka_head_static.sh
@@ -7,11 +7,11 @@ set -x
 set -e
 
 # Install conda+deps.
-wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-MacOSX-x86_64.sh -O miniconda.sh
+wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-${HEYOKA_PY_CONDA_ARCH}.sh -O miniconda.sh
 export deps_dir=$HOME/local
 export PATH="$HOME/miniconda/bin:$PATH"
 bash miniconda.sh -b -p $HOME/miniconda
-conda create -y -p $deps_dir python=3.11 c-compiler cxx-compiler git pybind11 'numpy>=2' \
+conda create -y -p $deps_dir python=${HEYOKA_PY_PY_VERSION} c-compiler cxx-compiler git pybind11 'numpy>=2' \
     ninja cmake llvmdev tbb-devel tbb astroquery libboost-devel sleef fmt skyfield \
     spdlog sympy cloudpickle 'mppp=2.*' numba
 source activate $deps_dir