From 4eb7dd115ddc00471f48cbdfab1349f30b5c8d0f Mon Sep 17 00:00:00 2001 From: Guillaume Fraux Date: Mon, 14 Oct 2024 12:14:10 +0200 Subject: [PATCH] Only define CONDA_BUILD_SYSROOT on CI It prevents local builds if the macOS SDK are installed in a different location --- .github/conda_build_config.yaml | 3 +++ .github/workflows/ci.yml | 10 +++++----- gromacs/conda_build_config.yaml | 2 -- lammps/conda_build_config.yaml | 2 -- plumed/conda_build_config.yaml | 2 -- py-plumed/conda_build_config.yaml | 3 --- 6 files changed, 8 insertions(+), 14 deletions(-) create mode 100644 .github/conda_build_config.yaml delete mode 100644 gromacs/conda_build_config.yaml delete mode 100644 lammps/conda_build_config.yaml diff --git a/.github/conda_build_config.yaml b/.github/conda_build_config.yaml new file mode 100644 index 0000000..b90d011 --- /dev/null +++ b/.github/conda_build_config.yaml @@ -0,0 +1,3 @@ +CONDA_BUILD_SYSROOT: + - /opt/MacOSX10.13.sdk # [osx and x86_64] + - /opt/MacOSX11.0.sdk # [osx and arm64] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb71ff0..e9286fd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 }} diff --git a/gromacs/conda_build_config.yaml b/gromacs/conda_build_config.yaml deleted file mode 100644 index e4cb6f2..0000000 --- a/gromacs/conda_build_config.yaml +++ /dev/null @@ -1,2 +0,0 @@ -CONDA_BUILD_SYSROOT: - - /opt/MacOSX10.9.sdk # [osx] diff --git a/lammps/conda_build_config.yaml b/lammps/conda_build_config.yaml deleted file mode 100644 index e4cb6f2..0000000 --- a/lammps/conda_build_config.yaml +++ /dev/null @@ -1,2 +0,0 @@ -CONDA_BUILD_SYSROOT: - - /opt/MacOSX10.9.sdk # [osx] diff --git a/plumed/conda_build_config.yaml b/plumed/conda_build_config.yaml index 428ae80..289631f 100644 --- a/plumed/conda_build_config.yaml +++ b/plumed/conda_build_config.yaml @@ -1,5 +1,3 @@ -CONDA_BUILD_SYSROOT: - - /opt/MacOSX10.9.sdk # [osx] mpi: - mpich - openmpi diff --git a/py-plumed/conda_build_config.yaml b/py-plumed/conda_build_config.yaml index 65a50c6..0fde6e5 100644 --- a/py-plumed/conda_build_config.yaml +++ b/py-plumed/conda_build_config.yaml @@ -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