Update autotools.yml and meson.yml

ralna · Apr 29, 2024 · 41cda0e · 41cda0e
1 parent 81f8793
commit 41cda0e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/autotools.yml b/.github/workflows/autotools.yml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-13]
-        compiler_version: ['11', '12', '13']
+        compiler_version: ['10', '11', '12']
         include:
           - compiler: gnu
             cc: gcc
@@ -30,7 +30,7 @@ jobs:
           #  fc: ifort
           #  cxx: icpc
           #  allow_failure: true
-          #- os:  macos-latest
+          #- os:  macos-13
           #  compiler: intel-classic
           #  compiler_version: 2021.9
           #  cc: icc
@@ -61,7 +61,7 @@ jobs:
           sudo apt-get install libhwloc-dev libudev-dev libmetis-dev libopenblas-dev
 
       - name: Install dependencies on MacOS
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-13'
         run: |
           brew install automake autoconf hwloc metis openblas
 
@@ -103,7 +103,7 @@ jobs:
             INTEL="-diag-disable=10441"
           fi
           LIB_CPP="-lstdc++"
-          if [[ "${{matrix.os}}" == "macos-latest" ]] && [[ "${{matrix.compiler}}" == "intel-classic" ]]; then
+          if [[ "${{matrix.os}}" == "macos-13" ]] && [[ "${{matrix.compiler}}" == "intel-classic" ]]; then
             LIB_CPP="-lc++"
           fi
           OPENMP="-fopenmp"
@@ -115,13 +115,14 @@ jobs:
             WARNING="-warn all"
             LIB_BLAS="-lmkl_rt"
           fi
-          if [[ "${{matrix.os}}" == "macos-latest" ]] && [[ "${{matrix.compiler}}" == "gnu" ]]; then
+          if [[ "${{matrix.os}}" == "macos-13" ]] && [[ "${{matrix.compiler}}" == "gnu" ]]; then
             INC_BLAS="-I$(brew --prefix openblas)/include"
             LIB_BLAS="-L$(brew --prefix openblas)/lib -lopenblas"
-            LD_CLASSIC="-Wl,-ld_classic"
+            LD_CLASSIC=""
+            # LD_CLASSIC="-Wl,-ld_classic"
           fi
           LIB_METIS="-lmetis"
-          if [[ "${{matrix.os}}" == "macos-latest" ]]; then
+          if [[ "${{matrix.os}}" == "macos-13" ]]; then
             LIB_METIS="-L$(brew --prefix metis)/lib -lmetis"
           fi
           ./configure CC=${{matrix.cc}} \

diff --git a/.github/workflows/meson.yml b/.github/workflows/meson.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest, macos-13]
-        compiler_version: ['13']
+        compiler_version: ['12']
         arch: ['x64']
         metis: [32, 64]
         include: