Skip to content

Commit 32b46d7

Browse files
Specify GCC and clang-format versions in Github runners (#148)
Co-authored-by: menon-karthik <[email protected]>
1 parent 8a58d68 commit 32b46d7

File tree

4 files changed

+22
-9
lines changed

4 files changed

+22
-9
lines changed

.github/workflows/codechecks.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ jobs:
88
- uses: actions/checkout@v3
99
- name: Install dependencies
1010
run: |
11-
sudo apt install clang-format
11+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
12+
sudo apt-get install clang-format-19
1213
- name: Run clang-format
1314
run: |
1415
mkdir Release
1516
cd Release
1617
cmake ..
17-
make codecheck
18+
make codecheck

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
doxyfile-path: 'docs/Doxyfile'
1919
enable-latex: true
2020
- name: Save documentation
21-
uses: actions/upload-artifact@v3
21+
uses: actions/upload-artifact@v4
2222
with:
2323
name: documentation
2424
path: ./docs/build/html

.github/workflows/test.yml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ jobs:
88
strategy:
99
matrix:
1010
os: [ubuntu-22.04, ubuntu-latest, macos-13, macos-latest]
11+
version: [13] # GCC version
1112
fail-fast: false
13+
env:
14+
GCC_V: ${{ matrix.version }}
1215
steps:
1316
- uses: actions/checkout@v4
1417
- uses: conda-incubator/setup-miniconda@v3
@@ -17,12 +20,21 @@ jobs:
1720
- name: Install ubuntu dependencies
1821
if: startsWith(matrix.os, 'ubuntu')
1922
run: sudo apt update && sudo apt install build-essential cmake lcov
20-
- name: Install svZeroDSolver
23+
- name: Create conda environment
2124
run: |
2225
#export PATH="/usr/share/miniconda/bin:$PATH"
2326
#alias conda="$CONDA/bin/conda"
2427
conda create -n zerod python=3.11.4
25-
conda run -n zerod pip install -e ".[dev]"
28+
- name: Install dependencies to get correct version numbers (Ubuntu)
29+
if: startsWith(matrix.os, 'ubuntu')
30+
run: conda install -n zerod -c conda-forge libstdcxx-ng=${GCC_V} gcc=${GCC_V}
31+
- name: Install dependencies to get correct version numbers (MacOS)
32+
if: startsWith(matrix.os, 'macos')
33+
run: |
34+
brew install gcc@${GCC_V}
35+
ln -s /usr/local/bin/gcc-${GCC_V} /usr/local/bin/gcc
36+
- name: Install svZeroDSolver
37+
run: conda run -n zerod pip install -e ".[dev]"
2638
- name: Install Networkx
2739
run: |
2840
conda run -n zerod pip install networkx
@@ -59,7 +71,7 @@ jobs:
5971
make coverage
6072
- name: Save coverage report
6173
if: startsWith(matrix.os, 'ubuntu-22.04')
62-
uses: actions/upload-artifact@v3
74+
uses: actions/upload-artifact@v4
6375
with:
6476
name: coverage_report
6577
path: Release/coverage
@@ -74,7 +86,7 @@ jobs:
7486
cpack
7587
cp distribution/svZeroDSolver_* ..
7688
- name: Upload installer
77-
uses: actions/upload-artifact@v3
89+
uses: actions/upload-artifact@v4
7890
with:
7991
name: ${{ matrix.os }} installer
8092
path: svZeroDSolver_*

src/solve/SimulationParameters.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,8 @@ void create_external_coupling(
444444
(connected_type == "BloodVessel")) {
445445
connections.push_back({connected_block, coupling_name});
446446
} // connected_type == "ClosedLoopRCR"
447-
} // coupling_loc
448-
} // for (size_t i = 0; i < coupling_configs.length(); i++)
447+
} // coupling_loc
448+
} // for (size_t i = 0; i < coupling_configs.length(); i++)
449449
}
450450

451451
void create_junctions(

0 commit comments

Comments
 (0)