From d3edef2ae17f71afc701dc1ee0114282a5aad831 Mon Sep 17 00:00:00 2001 From: Justin Wozniak Date: Wed, 11 Sep 2024 15:29:48 -0500 Subject: [PATCH] Try to fix PATHs --- dev/github-actions/setup-conda.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dev/github-actions/setup-conda.sh b/dev/github-actions/setup-conda.sh index 470e62031..d34165a5a 100755 --- a/dev/github-actions/setup-conda.sh +++ b/dev/github-actions/setup-conda.sh @@ -35,7 +35,6 @@ esac # Basic Mac packages: PKGS_MAC=( - autoconf automake coreutils # To resolve the sed -i problem on Mac @@ -50,7 +49,7 @@ case $MATRIX_OS in PKGS=( zsh ) ;; "macos-13") - # macos-13 already has autoconf, automake + # macos-13 already has autoconf set -x ls /usr/local/opt/ PKGS=( ${PKGS_MAC[@]} ) @@ -58,13 +57,11 @@ case $MATRIX_OS in "macos-14") PKGS=( ${PKGS_MAC[@]} autoconf - automake ) ;; "macos-14-arm64") PKGS=( ${PKGS_MAC[@]} autoconf - automake ) ;; *) @@ -92,6 +89,8 @@ fi case $MATRIX_OS in macos-13) BINS=( + /usr/local/opt/autoconf/bin + /usr/local/opt/automake/bin /usr/local/opt/coreutils/libexec/gnubin /usr/local/opt/gnu-sed/libexec/gnubin /usr/local/opt/gnu-time/libexec/gnubin @@ -102,7 +101,7 @@ case $MATRIX_OS in /opt/homebrew/opt/coreutils/libexec/gnubin /opt/homebrew/opt/gnu-sed/libexec/gnubin /opt/homebrew/opt/gnu-time/libexec/gnubin - /opt/homebrew/opt/bin + /opt/homebrew/bin ) ;; esac