Merge remote-tracking branch 'app4triqs-remote/3.3.x' into 1.3.x

.github/workflows/build.yml

@@ -26,33 +26,32 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - {os: ubuntu-22.04, cc: gcc-12, cxx: g++-12, doc: OFF}
-          - {os: ubuntu-22.04, cc: clang-15, cxx: clang++-15, doc: ON}
-          - {os: macos-12, cc: gcc-12, cxx: g++-12, doc: OFF}
-          - {os: macos-12, cc: clang, cxx: clang++, doc: OFF}
+          - {os: ubuntu-24.04, cc: gcc, cxx: g++, doc: OFF, cov: OFF}
+          - {os: ubuntu-24.04, cc: clang, cxx: clang++, doc: OFF, cov: ON}
+          - {os: macos-14, cc: gcc-14, cxx: g++-14, doc: OFF, cov: OFF}
+          - {os: macos-14, cc: clang, cxx: clang++, doc: ON, cov: OFF}
 
     runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v4
 
-    - uses: actions/cache/restore@v3
+    - uses: actions/cache/restore@v4
       with:
         path: ${{ env.CCACHE_DIR }}
         key: ccache-${{ matrix.os }}-${{ matrix.cc }}-${{ github.run_id }}
         restore-keys:
           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
@@ -69,7 +68,7 @@ jobs:
         openmpi-bin
         openmpi-common
         openmpi-doc
-        python3-clang-15
+        python3-clang
         python3-dev
         python3-mako
         python3-mpi4py
@@ -80,7 +79,7 @@ jobs:
         python3-nbsphinx
 
     - name: Install homebrew dependencies
-      if: matrix.os == 'macos-12'
+      if: ${{ contains(matrix.os, 'macos') }}
       run: |
         brew install ccache gcc@12 llvm hdf5 open-mpi openblas
         mkdir $HOME/.venv
@@ -89,7 +88,7 @@ jobs:
         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: Build doxygen
       if: matrix.doc == 'ON'
@@ -111,7 +110,6 @@ jobs:
     - 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: Prepare source files for doxygen
@@ -127,14 +125,12 @@ jobs:
       env:
         CC: ${{ matrix.cc }}
         CXX: ${{ matrix.cxx }}
-        LIBRARY_PATH: /usr/local/opt/llvm/lib
       run: |
         mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/install -DBuild_Documentation=${{ matrix.doc }} -DPythonSupport=ON
         make -j2 || make -j1 VERBOSE=1
 
     - name: Test nda
       env:
-        DYLD_FALLBACK_LIBRARY_PATH: /usr/local/opt/llvm/lib
         OPENBLAS_NUM_THREADS: "1"
       run: |
         cd build
@@ -144,7 +140,7 @@ jobs:
       if: always()
       run: ccache -sv
 
-    - uses: actions/cache/save@v3
+    - uses: actions/cache/save@v4
       if: always()
       with:
         path: ${{ env.CCACHE_DIR }}

Jenkinsfile

@@ -55,8 +55,8 @@ for (int i = 0; i < dockerPlatforms.size(); i++) {
 
 /****************** osx builds (on host) */
 def osxPlatforms = [
-  ["gcc", ['CC=gcc-13', 'CXX=g++-13', 'FC=gfortran-13']],
-  ["clang", ['CC=$BREW/opt/llvm/bin/clang', 'CXX=$BREW/opt/llvm/bin/clang++', 'FC=gfortran-13', 'CXXFLAGS=-I$BREW/opt/llvm/include', 'LDFLAGS=-L$BREW/opt/llvm/lib']]
+  ["gcc", ['CC=gcc-14', 'CXX=g++-14', 'FC=gfortran-14']],
+  ["clang", ['CC=$BREW/opt/llvm/bin/clang', 'CXX=$BREW/opt/llvm/bin/clang++', 'FC=gfortran-14', 'CXXFLAGS=-I$BREW/opt/llvm/include', 'LDFLAGS=-L$BREW/opt/llvm/lib']]
 ]
 for (int i = 0; i < osxPlatforms.size(); i++) {
   def platformEnv = osxPlatforms[i]
@@ -84,7 +84,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
           "CPLUS_INCLUDE_PATH=$venv/include:$hdf5/include:${env.BREW}/include",
           "LIBRARY_PATH=$venv/lib:$hdf5/lib:${env.BREW}/lib",
           "LD_LIBRARY_PATH=$hdf5/lib",
-          "PYTHONPATH=$installDir/lib/python3.9/site-packages",
+          "PYTHONPATH=$installDir/lib/python3.12/site-packages",
           "CMAKE_PREFIX_PATH=$venv/lib/cmake/triqs",
           "VIRTUAL_ENV=$venv",
           "OMP_NUM_THREADS=2"]) {