From 62014807ddb075a2d378273a03150642dbe81861 Mon Sep 17 00:00:00 2001 From: edoapra Date: Mon, 8 Dec 2025 15:34:13 -0800 Subject: [PATCH 1/2] install gfortran with homebrew --- .github/workflows/github_actions.yml | 9 +++++++++ travis/install-mpi.sh | 17 ++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.github/workflows/github_actions.yml b/.github/workflows/github_actions.yml index fc90d366e..d4c4722a3 100644 --- a/.github/workflows/github_actions.yml +++ b/.github/workflows/github_actions.yml @@ -181,6 +181,15 @@ jobs: macos*) brew update brew install coreutils automake || true + if [[ "$F77" =~ gfortran-[0-9][0-9] ]] || [[ "$CC" =~ gcc-[0-9][0-9] ]]; then + if [[ "$CC" =~ gcc-[0-9][0-9] ]]; then + version=$(echo "$CC" | cut -d - -f 2 ) + fi + if [[ "$F77" =~ gfortran-[0-9][0-9] ]]; then + version=$(echo "$F77" | cut -d - -f 2 ) + fi + brew reinstall gcc@${version} + fi ;; esac if [[ "$F77" == "ifort" ]] || [[ "$CC" == "icc" ]] || [[ "$CC" == "icx" ]]; then ./travis/install-intel.sh; source ${{ matrix.oneapi }}/setvars.sh --force; fi diff --git a/travis/install-mpi.sh b/travis/install-mpi.sh index 6916cb257..ef9afcf9e 100755 --- a/travis/install-mpi.sh +++ b/travis/install-mpi.sh @@ -21,11 +21,18 @@ if [[ -z "${F77}" ]]; then F77="${FC}" fi -if [ "$F77" == "gfortran" ] && [ "$os" == "Darwin" ]; then - if [[ ! -x "$(command -v gfortran)" ]]; then - echo gfortran undefined - echo symbolic link gfortran-12 - ln -sf /usr/local/bin/gfortran-12 /usr/local/bin/gfortran +if [ "$os" == "Darwin" ]; then + if [[ ! -x "$(command -v ${FC})" ]]; then + if [[ "${FC}" == *"-"* ]]; then + gccver=$(echo ${FC} | cut -d - -f 2) + brew install gcc@"${gccver}" + elif [[ "${FC}" == "gfortran" ]]; then + brew reinstall gcc + else + echo "cannot install ${FC}" + exit 10 + fi + ${FC} --version fi fi From 1a62ab3d3d3cdf7c338e70ce6c7e3d15293d250e Mon Sep 17 00:00:00 2001 From: edoapra Date: Mon, 8 Dec 2025 16:49:10 -0800 Subject: [PATCH 2/2] macos-13 gone --- .github/workflows/github_actions.yml | 12 ++---------- travis/install-intel.sh | 3 +++ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/github_actions.yml b/.github/workflows/github_actions.yml index d4c4722a3..a31fbe7da 100644 --- a/.github/workflows/github_actions.yml +++ b/.github/workflows/github_actions.yml @@ -61,14 +61,6 @@ jobs: config_opts: --enable-i4 --without-blas --enable-cxx --disable-f77 f77: gfortran cc: gcc - - os: macos-13 - experimental: true - mpi_impl: mpich - armci_network: mpi-pr - f77: ifort - cc: icc - config_opts: LIBS=-lifcore - oneapi: /Users/runner/apps/oneapi - os: ubuntu-22.04 experimental: true mpi_impl: mpich @@ -83,14 +75,14 @@ jobs: config_opts: "--disable-f77 --enable-cxx" f77: gfortran-10 cc: gcc-10 - - os: macos-13 + - os: macos-15 experimental: true mpi_impl: mpich armci_network: mpi-ts config_opts: "--disable-static --enable-shared" f77: gfortran-13 cc: clang - - os: macos-13 + - os: macos-15 experimental: true use_cmake: "Y" mpi_impl: mpich diff --git a/travis/install-intel.sh b/travis/install-intel.sh index b85c87def..2a45d29a7 100755 --- a/travis/install-intel.sh +++ b/travis/install-intel.sh @@ -59,6 +59,9 @@ case "$os" in my_id=`id -u` sudo chown -R $my_id /opt/intel sudo chgrp -R $my_gr /opt/intel + if [[ "$MPI_IMPL" == "mpich" ]]; then + brew install hwloc + fi ;; Linux) export APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1