Skip to content

Commit e063d7d

Browse files
committed
fix(ci): fix CMAKE_PREFIX_PATH and compiler installation
- Remove invalid CMAKE_PREFIX_PATH env var that used incorrect path expansion - Add LLVM repository for clang-16 installation - Add toolchain PPA for gcc-13 installation - Fix same CMAKE_PREFIX_PATH issue in docs.yml
1 parent 1134600 commit e063d7d

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,18 @@ jobs:
126126
- name: Install dependencies (Ubuntu)
127127
run: |
128128
sudo apt-get update
129+
# Add LLVM repository for clang-16
130+
if [[ "${{ matrix.compiler }}" == "clang-16" ]]; then
131+
wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/llvm.asc
132+
echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" | sudo tee /etc/apt/sources.list.d/llvm.list
133+
sudo apt-get update
134+
fi
135+
# Add toolchain PPA for gcc-13 if needed (Ubuntu 22.04 may not have it by default)
136+
if [[ "${{ matrix.compiler }}" == "gcc-13" ]]; then
137+
sudo apt-get install -y software-properties-common
138+
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
139+
sudo apt-get update
140+
fi
129141
sudo apt-get install -y \
130142
${{ matrix.cc }} \
131143
${{ matrix.cxx }} \
@@ -169,7 +181,6 @@ jobs:
169181
env:
170182
CC: ${{ matrix.cc }}
171183
CXX: ${{ matrix.cxx }}
172-
CMAKE_PREFIX_PATH: ${{ github.workspace }}/~/opt/heffte
173184
run: |
174185
cmake -S . -B build \
175186
-GNinja \

.github/workflows/docs.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ jobs:
6868
cmake --install heffte-build
6969
7070
- name: Configure OpenPFC
71-
env:
72-
CMAKE_PREFIX_PATH: ${{ github.workspace }}/~/opt/heffte
7371
run: |
7472
cmake -S . -B build \
7573
-GNinja \

0 commit comments

Comments
 (0)