Merge branch 'v2.8' into v2.9

plumed · Apr 4, 2024 · a00cf1d · a00cf1d
2 parents 5cb7766 + c634592
commit a00cf1d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -316,7 +316,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04 , macos-12]
+        os: [ubuntu-20.04 , macos-12, macos-14 ]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4

diff --git a/conda/plumed/conda_build_config.yaml b/conda/plumed/conda_build_config.yaml
@@ -1,6 +1,3 @@
 CONDA_BUILD_SYSROOT:
-  - /opt/MacOSX10.9.sdk   # [osx]
-libblas:
-- 3.8 *netlib
-liblapack:
-- 3.8.0 *netlib
+  - /opt/MacOSX10.9.sdk   # [osx and x86_64]
+  - /opt/MacOSX11.0.sdk   # [osx and arm64]
diff --git a/conda/py-plumed/conda_build_config.yaml b/conda/py-plumed/conda_build_config.yaml
@@ -1,5 +1,6 @@
 CONDA_BUILD_SYSROOT:
-  - /opt/MacOSX10.9.sdk   # [osx]
+  - /opt/MacOSX10.9.sdk   # [osx and x86_64]
+  - /opt/MacOSX11.0.sdk   # [osx and arm64]
 python:
     - 3.8
     - 3.9

diff --git a/conda/run-conda-upload.sh b/conda/run-conda-upload.sh
@@ -1,22 +1,13 @@
 #! /usr/bin/env bash
 
-if [[ "$(uname)" == Linux ]]; then
-    OS_NAME=linux
-elif [[ "$(uname)" == "Darwin" ]]; then
-    OS_NAME=osx
-else
-    echo "Unsupported system $(uname)"
-    exit 1
-fi
-
 CONDA_USER=plumed  # the conda channel
 if test -n "$TRAVIS_REPO_SLUG" ; then
   CONDA_USER="${TRAVIS_REPO_SLUG%/*}"
 fi
 
 if [[ -n "$CONDA_UPLOAD_TOKEN" ]]; then
-    anaconda -t $CONDA_UPLOAD_TOKEN upload -u $CONDA_USER -l $CONDA_LABEL $CONDA_PREFIX/conda-bld/$OS_NAME-64/plumed*.tar.bz2 --force
-    anaconda -t $CONDA_UPLOAD_TOKEN upload -u $CONDA_USER -l $CONDA_LABEL $CONDA_PREFIX/conda-bld/$OS_NAME-64/py-plumed*.tar.bz2 --force
+    anaconda -t $CONDA_UPLOAD_TOKEN upload -u $CONDA_USER -l $CONDA_LABEL $CONDA_PREFIX/conda-bld/*/plumed*.tar.bz2 --force
+    anaconda -t $CONDA_UPLOAD_TOKEN upload -u $CONDA_USER -l $CONDA_LABEL $CONDA_PREFIX/conda-bld/*/py-plumed*.tar.bz2 --force
 fi