Skip to content

Commit 8ac0bc6

Browse files
authored
Merge pull request #1113 from PowerGridModel/feature/update-ci-build-tools
CI: update ci build tools
2 parents 38a1421 + 8d95bc1 commit 8ac0bc6

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

.github/workflows/build-test-release.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,15 @@ jobs:
260260
conda info
261261
conda list
262262
263-
- uses: ./.github/actions/enable-msvc
263+
- name: Enable MSVC
264+
uses: ./.github/actions/enable-msvc
264265
if: runner.os == 'Windows'
265266

267+
- name: Enable gcc/g++
268+
if: matrix.os == 'ubuntu'
269+
run: |
270+
conda install -y gcc_linux-64 gxx_linux-64
271+
266272
- name: Build and install cmake target for Windows
267273
if: matrix.os == 'windows'
268274
run: |

.github/workflows/check-code-quality.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ jobs:
4242
4343
- name: Install and run ruff
4444
run: |
45-
pip install ruff .
45+
pip install ruff
4646
ruff check .
4747
ruff format .
4848
git restore README.md
4949
5050
- name: Install and run clang-format
5151
run: |
52-
sudo apt-get update && sudo apt-get install -y clang-format-18
52+
sudo apt-get install -y clang-format-18
5353
find . -regex '.*\.\(h\|c\|cpp\|hpp\|cc\|cxx\)' -exec clang-format-18 -style=file -i {} \;
5454
5555
- name: Install and run markdownlint
@@ -60,7 +60,6 @@ jobs:
6060
6161
- name: If needed raise error
6262
run: |
63-
6463
if [[ `git status --porcelain --untracked-files=no` ]]; then
6564
echo "Formatting not correct! See below the files which need to be reformatted!"
6665
git status --porcelain --untracked-files=no

.readthedocs.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ sphinx:
1111
build:
1212
os: "ubuntu-24.04"
1313
tools:
14-
python: "3.11"
14+
python: "3.13"
1515
apt_packages:
1616
- graphviz
17+
- gcc-14
18+
- g++-14
1719
jobs:
1820
post_install:
1921
# Build package with doc requirements from pyproject.optional-dependencies
20-
- pip install --verbose --editable .[doc]
22+
- CC=gcc-14 CXX=g++-14 pip install --verbose --editable .[doc]
2123

2224
# remove API DLL define in header
2325
- find power_grid_model_c/power_grid_model_c/include -name *.h -exec sed -i -r "s/#define PGM.*//g" {} \;

0 commit comments

Comments
 (0)