Skip to content

Commit

Permalink
Only define CONDA_BUILD_SYSROOT on CI
Browse files Browse the repository at this point in the history
It prevents local builds if the macOS SDK are installed in
a different location
  • Loading branch information
Luthaf committed Oct 14, 2024
1 parent e4e9758 commit 4eb7dd1
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 14 deletions.
3 changes: 3 additions & 0 deletions .github/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CONDA_BUILD_SYSROOT:
- /opt/MacOSX10.13.sdk # [osx and x86_64]
- /opt/MacOSX11.0.sdk # [osx and arm64]
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04 , macos-11]
os: [ubuntu-22.04, macos-11, macos-14]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand All @@ -23,10 +23,10 @@ jobs:
export MAKEFLAGS=-j3
conda create --name build
source activate build
conda-build -c conda-forge plumed
conda-build -c conda-forge py-plumed
conda-build -c conda-forge gromacs
conda-build -c conda-forge lammps
conda-build -m .github/conda_build_config.yaml -c conda-forge plumed
conda-build -m .github/conda_build_config.yaml -c conda-forge py-plumed
conda-build -m .github/conda_build_config.yaml -c conda-forge gromacs
conda-build -m .github/conda_build_config.yaml -c conda-forge lammps
- name: Deploy
env:
CONDA_UPLOAD_TOKEN: ${{ secrets.CONDA_UPLOAD_TOKEN }}
Expand Down
2 changes: 0 additions & 2 deletions gromacs/conda_build_config.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions lammps/conda_build_config.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions plumed/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
CONDA_BUILD_SYSROOT:
- /opt/MacOSX10.9.sdk # [osx]
mpi:
- mpich
- openmpi
3 changes: 0 additions & 3 deletions py-plumed/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
CONDA_BUILD_SYSROOT:
- /opt/MacOSX10.13.sdk # [osx and x86_64]
- /opt/MacOSX11.0.sdk # [osx and arm64]
python:
- 3.8
- 3.9
Expand Down

0 comments on commit 4eb7dd1

Please sign in to comment.