Skip to content

Commit e55430f

Browse files
committed
Merge remote-tracking branch 'app4triqs-remote/unstable' into unstable
2 parents 4364abb + c3d525f commit e55430f

File tree

1 file changed

+23
-21
lines changed

1 file changed

+23
-21
lines changed

.github/workflows/build.yml

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
include:
29-
- {os: ubuntu-22.04, cc: gcc-12, cxx: g++-12}
30-
- {os: ubuntu-22.04, cc: clang-15, cxx: clang++-15}
31-
- {os: macos-12, cc: gcc-12, cxx: g++-12}
32-
- {os: macos-12, cc: clang, cxx: clang++}
29+
- {os: ubuntu-24.04, cc: gcc, cxx: g++}
30+
- {os: ubuntu-24.04, cc: clang, cxx: clang++}
31+
- {os: macos-14, cc: gcc-14, cxx: g++-14}
32+
- {os: macos-14, cc: clang, cxx: clang++}
3333

3434
runs-on: ${{ matrix.os }}
3535

@@ -44,23 +44,22 @@ jobs:
4444
ccache-${{ matrix.os }}-${{ matrix.cc }}-
4545

4646
- name: Install ubuntu dependencies
47-
if: matrix.os == 'ubuntu-22.04'
47+
if: ${{ contains(matrix.os, 'ubuntu') }}
4848
run: >
4949
sudo apt-get update &&
5050
sudo apt-get install lsb-release wget software-properties-common &&
51-
wget -O /tmp/llvm.sh https://apt.llvm.org/llvm.sh && sudo chmod +x /tmp/llvm.sh && sudo /tmp/llvm.sh 15 &&
5251
sudo apt-get install
5352
ccache
54-
clang-15
55-
g++-12
53+
clang
54+
g++
5655
gfortran
5756
hdf5-tools
5857
libblas-dev
5958
libboost-dev
60-
libclang-15-dev
61-
libc++-15-dev
62-
libc++abi-15-dev
63-
libomp-15-dev
59+
libclang-dev
60+
libc++-dev
61+
libc++abi-dev
62+
libomp-dev
6463
libfftw3-dev
6564
libnfft3-dev
6665
libgfortran5
@@ -71,7 +70,7 @@ jobs:
7170
openmpi-bin
7271
openmpi-common
7372
openmpi-doc
74-
python3-clang-15
73+
python3-clang
7574
python3-dev
7675
python3-mako
7776
python3-matplotlib
@@ -83,29 +82,34 @@ jobs:
8382
python3-nbsphinx
8483
8584
- name: Install homebrew dependencies
86-
if: matrix.os == 'macos-12'
85+
if: ${{ contains(matrix.os, 'macos') }}
8786
run: |
88-
brew install ccache gcc@12 llvm boost fftw hdf5 open-mpi openblas
87+
brew update
88+
brew install ccache gcc llvm boost fftw hdf5 open-mpi openblas
8989
mkdir $HOME/.venv
9090
python3 -m venv $HOME/.venv/my_python
9191
source $HOME/.venv/my_python/bin/activate
9292
pip install mako numpy scipy mpi4py
9393
pip install -r requirements.txt
9494
echo "VIRTUAL_ENV=$VIRTUAL_ENV" >> $GITHUB_ENV
95-
echo "PATH=$PATH" >> $GITHUB_ENV
95+
echo "PATH=$(brew --prefix llvm)/bin:$(brew --prefix gcc)/bin:$PATH" >> $GITHUB_ENV
9696
97-
- name: add clang cxxflags
97+
- name: Add clang CXXFLAGS
9898
if: ${{ contains(matrix.cxx, 'clang') }}
9999
run: |
100-
echo "PATH=/usr/local/opt/llvm/bin:$PATH" >> $GITHUB_ENV
101100
echo "CXXFLAGS=-stdlib=libc++" >> $GITHUB_ENV
102101
102+
- name: Add clang LDFLAGS for macos to link against brew's libc++
103+
if: ${{ contains(matrix.os, 'macos') && contains(matrix.cxx, 'clang') }}
104+
run: |
105+
echo 'LDFLAGS="-L$(brew --prefix llvm)/lib/c++ -L$(brew --prefix llvm)/lib -lunwind"' >> $GITHUB_ENV
106+
103107
- name: Build & Install TRIQS
104108
env:
105109
CC: ${{ matrix.cc }}
106110
CXX: ${{ matrix.cxx }}
107111
run: |
108-
git clone https://github.com/TRIQS/triqs --branch unstable
112+
git clone https://github.com/TRIQS/triqs --branch ${{ github.ref_name }}
109113
mkdir triqs/build && cd triqs/build
110114
cmake .. -DBuild_Tests=OFF -DCMAKE_INSTALL_PREFIX=$HOME/install
111115
make -j1 install VERBOSE=1
@@ -115,15 +119,13 @@ jobs:
115119
env:
116120
CC: ${{ matrix.cc }}
117121
CXX: ${{ matrix.cxx }}
118-
LIBRARY_PATH: /usr/local/opt/llvm/lib
119122
run: |
120123
source $HOME/install/share/triqs/triqsvars.sh
121124
mkdir build && cd build && cmake ..
122125
make -j2 || make -j1 VERBOSE=1
123126
124127
- name: Test ctseg
125128
env:
126-
DYLD_FALLBACK_LIBRARY_PATH: /usr/local/opt/llvm/lib
127129
OPENBLAS_NUM_THREADS: "1"
128130
run: |
129131
source $HOME/install/share/triqs/triqsvars.sh

0 commit comments

Comments
 (0)