Skip to content

Commit c7156f8

Browse files
committed
resolve some (not all) comments
Signed-off-by: Martijn Govers <Martijn.Govers@Alliander.com>
1 parent 6604d4f commit c7156f8

2 files changed

Lines changed: 18 additions & 23 deletions

File tree

.github/workflows/check-build-reproducibility.yml

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ jobs:
4343
sudo ln -s /usr/bin/gcc-14 /usr/local/bin/gcc
4444
sudo ln -s /usr/bin/g++-14 /usr/local/bin/g++
4545
46-
- name: Enable brew
47-
run: |
48-
echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH
49-
- name: Install C++ dependencies
46+
- name: Install uv
47+
uses: astral-sh/setup-uv@v7
48+
49+
- name: Install pgm-build-dependencies
5050
run: |
51-
brew update
52-
brew install boost eigen nlohmann-json msgpack-cxx doctest
51+
uv tool install https://github.com/PowerGridModel/pgm-build-dependencies/releases/latest/download/pgm_build_dependencies-0.1.0-py3-none-any.whl
52+
pgm-build-setup-ga-ci
5353
5454
- name: Build twice
5555
run: |
@@ -85,21 +85,13 @@ jobs:
8585
steps:
8686
- uses: actions/checkout@v6
8787

88-
- name: Activate conda
89-
uses: conda-incubator/setup-miniconda@v3 # install miniforge instead
90-
with:
91-
miniforge-version: latest
92-
channels: conda-forge
93-
conda-remove-defaults: "true"
94-
95-
- name: List conda
96-
run: |
97-
conda info
98-
conda list
88+
- name: Install uv
89+
uses: astral-sh/setup-uv@v7
9990

100-
- name: Install conda environment
91+
- name: Install pgm-build-dependencies
10192
run: |
102-
conda create --yes -p C:\conda_envs\cpp_pkgs -c conda-forge libboost-headers eigen nlohmann_json msgpack-cxx doctest
93+
uv tool install https://github.com/PowerGridModel/pgm-build-dependencies/releases/latest/download/pgm_build_dependencies-0.1.0-py3-none-any.whl
94+
pgm-build-setup-ga-ci
10395
10496
- uses: ./.github/actions/enable-msvc
10597
if: runner.os == 'Windows'
@@ -148,10 +140,13 @@ jobs:
148140
with:
149141
xcode-version: latest-stable
150142

151-
- name: Install cpp dependencies
143+
- name: Install uv
144+
uses: astral-sh/setup-uv@v7
145+
146+
- name: Install pgm-build-dependencies
152147
run: |
153-
brew update
154-
brew install ninja boost eigen nlohmann-json msgpack-cxx doctest
148+
uv tool install https://github.com/PowerGridModel/pgm-build-dependencies/releases/latest/download/pgm_build_dependencies-0.1.0-py3-none-any.whl
149+
pgm-build-setup-ga-ci
155150
156151
- name: Build twice
157152
run: |

tests/package_tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ target_link_libraries(
2727
)
2828
set_target_properties(
2929
power_grid_model_package_test
30-
PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE BUILD_RPATH_USE_ORIGIN TRUE
30+
PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE
3131
)
3232

3333
# TODO: remove this when the API becomes stable

0 commit comments

Comments
 (0)