From 7ce5821afd4ac107c8f5225c57d9586d4cead55e Mon Sep 17 00:00:00 2001
From: Thomas Hahn <thomas.hahn01@gmail.com>
Date: Mon, 30 Sep 2024 14:35:30 -0400
Subject: [PATCH 1/2] [ghactions] Update runner images and compiler version

---
 .github/workflows/build.yml | 44 +++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2c6d464..d021188 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,10 +26,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {os: ubuntu-22.04, cc: gcc-12, cxx: g++-12}
-          - {os: ubuntu-22.04, cc: clang-15, cxx: clang++-15}
-          - {os: macos-12, cc: gcc-12, cxx: g++-12}
-          - {os: macos-12, cc: clang, cxx: clang++}
+          - {os: ubuntu-24.04, cc: gcc, cxx: g++}
+          - {os: ubuntu-24.04, cc: clang, cxx: clang++}
+          - {os: macos-14, cc: gcc-14, cxx: g++-14}
+          - {os: macos-14, cc: clang, cxx: clang++}
 
     runs-on: ${{ matrix.os }}
 
@@ -44,23 +44,22 @@ jobs:
           ccache-${{ matrix.os }}-${{ matrix.cc }}-
 
     - name: Install ubuntu dependencies
-      if: matrix.os == 'ubuntu-22.04'
+      if: ${{ contains(matrix.os, 'ubuntu') }}
       run: >
         sudo apt-get update &&
         sudo apt-get install lsb-release wget software-properties-common &&
-        wget -O /tmp/llvm.sh https://apt.llvm.org/llvm.sh && sudo chmod +x /tmp/llvm.sh && sudo /tmp/llvm.sh 15 &&
         sudo apt-get install
         ccache
-        clang-15
-        g++-12
+        clang
+        g++
         gfortran
         hdf5-tools
         libblas-dev
         libboost-dev
-        libclang-15-dev
-        libc++-15-dev
-        libc++abi-15-dev
-        libomp-15-dev
+        libclang-dev
+        libc++-dev
+        libc++abi-dev
+        libomp-dev
         libfftw3-dev
         libgfortran5
         libgmp-dev
@@ -70,7 +69,7 @@ jobs:
         openmpi-bin
         openmpi-common
         openmpi-doc
-        python3-clang-15
+        python3-clang
         python3-dev
         python3-mako
         python3-matplotlib
@@ -82,29 +81,34 @@ jobs:
         python3-nbsphinx
 
     - name: Install homebrew dependencies
-      if: matrix.os == 'macos-12'
+      if: ${{ contains(matrix.os, 'macos') }}
       run: |
-        brew install ccache gcc@12 llvm boost fftw hdf5 open-mpi openblas
+        brew update
+        brew install ccache gcc llvm boost fftw hdf5 open-mpi openblas
         mkdir $HOME/.venv
         python3 -m venv $HOME/.venv/my_python
         source $HOME/.venv/my_python/bin/activate
         pip install mako numpy scipy mpi4py
         pip install -r requirements.txt
         echo "VIRTUAL_ENV=$VIRTUAL_ENV" >> $GITHUB_ENV
-        echo "PATH=$PATH" >> $GITHUB_ENV
+        echo "PATH=$(brew --prefix llvm)/bin:$(brew --prefix gcc)/bin:$PATH" >> $GITHUB_ENV
 
-    - name: add clang cxxflags
+    - name: Add clang CXXFLAGS
       if: ${{ contains(matrix.cxx, 'clang') }}
       run: |
-        echo "PATH=/usr/local/opt/llvm/bin:$PATH" >> $GITHUB_ENV
         echo "CXXFLAGS=-stdlib=libc++" >> $GITHUB_ENV
 
+    - name: Add clang LDFLAGS for macos to link against brew's libc++
+      if: ${{ contains(matrix.os, 'macos') && contains(matrix.cxx, 'clang') }}
+      run: |
+        echo 'LDFLAGS="-L$(brew --prefix llvm)/lib/c++ -L$(brew --prefix llvm)/lib -lunwind"' >> $GITHUB_ENV
+
     - name: Build & Install TRIQS
       env:
         CC: ${{ matrix.cc }}
         CXX: ${{ matrix.cxx }}
       run: |
-        git clone https://github.com/TRIQS/triqs --branch ${{ github.ref_name }}
+        git clone https://github.com/TRIQS/triqs --branch unstable
         mkdir triqs/build && cd triqs/build
         cmake .. -DBuild_Tests=OFF -DCMAKE_INSTALL_PREFIX=$HOME/install
         make -j1 install VERBOSE=1
@@ -114,7 +118,6 @@ jobs:
       env:
         CC: ${{ matrix.cc }}
         CXX: ${{ matrix.cxx }}
-        LIBRARY_PATH: /usr/local/opt/llvm/lib
       run: |
         source $HOME/install/share/triqs/triqsvars.sh
         mkdir build && cd build && cmake ..
@@ -122,7 +125,6 @@ jobs:
 
     - name: Test app4triqs
       env:
-        DYLD_FALLBACK_LIBRARY_PATH: /usr/local/opt/llvm/lib
         OPENBLAS_NUM_THREADS: "1"
       run: |
         source $HOME/install/share/triqs/triqsvars.sh

From 1bad8a0e5b3753765a9ca6bdfc7c2a6e376dd9f4 Mon Sep 17 00:00:00 2001
From: Thomas Hahn <thomas.hahn01@gmail.com>
Date: Mon, 30 Sep 2024 15:31:32 -0400
Subject: [PATCH 2/2] [ghactions] Undo previous branch change when cloning
 triqs

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d021188..6f193af 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -108,7 +108,7 @@ jobs:
         CC: ${{ matrix.cc }}
         CXX: ${{ matrix.cxx }}
       run: |
-        git clone https://github.com/TRIQS/triqs --branch unstable
+        git clone https://github.com/TRIQS/triqs --branch ${{ github.ref_name }}
         mkdir triqs/build && cd triqs/build
         cmake .. -DBuild_Tests=OFF -DCMAKE_INSTALL_PREFIX=$HOME/install
         make -j1 install VERBOSE=1