From fccecbe16048725e570798c39eede6428c75014b Mon Sep 17 00:00:00 2001 From: Garrett Barter Date: Thu, 2 May 2024 07:53:35 -0600 Subject: [PATCH] try mac and windows again --- .github/workflows/CI_pyHAMS.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/CI_pyHAMS.yml b/.github/workflows/CI_pyHAMS.yml index 6d2c60b..2094bce 100644 --- a/.github/workflows/CI_pyHAMS.yml +++ b/.github/workflows/CI_pyHAMS.yml @@ -36,21 +36,21 @@ jobs: with: path-type: inherit update: true - msystem: MINGW64 install: >- - cmake - pkg-config - gcc - gcc-libs - gcc-fortran - openblas - openblas64 + mingw-w64-x86_64-cmake + mingw-w64-x86_64-pkg-config + mingw-w64-x86_64-gcc + mingw-w64-x86_64-gcc-libs + mingw-w64-x86_64-gcc-fortran + mingw-w64-x86_64-openblas + mingw-w64-x86_64-openblas64 - name: Set compilers if: contains( matrix.os, 'windows') run: | mv C:\\Strawberry\\perl\\bin\\pkg-config.BAT C:\\Strawberry\\perl\\bin\\old-pkg-config.old mv C:\\Strawberry\\perl\\bin\\pkg-config C:\\Strawberry\\perl\\bin\\old-pkg-config + export PATH=/c/msys64/mingw64/bin:$PATH - name: checkout repository @@ -61,7 +61,8 @@ jobs: run: | #export PKG_CONFIG_PATH="/usr/local/opt/openblas/lib/pkgconfig:$PKG_CONFIG_PATH" #sudo ln -s /usr/local/opt/openblas/lib/libopenblas* /usr/local/lib/ - brew install openblas libomp + brew install openblas libomp + brew reinstall gcc - name: Linux openblas if: contains( matrix.os, 'ubuntu')