Skip to content

Commit 47e9ed5

Browse files
committed
fix python build
1 parent e782b2a commit 47e9ed5

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ jobs:
4141
id: cache-simgrid
4242
with:
4343
path: /opt/simgrid
44-
key: ${{ runner.os }}-simgrid-${{ hashFiles('.github/workflows/build.yml') }}
44+
key: ${{ runner.os }}-simgrid-python-${{ hashFiles('.github/workflows/build.yml') }}
4545

4646
- name: Install SimGrid
4747
if: steps.cache-simgrid.outputs.cache-hit != 'true'
4848
run: |
4949
git clone --depth 1 https://framagit.org/simgrid/simgrid.git
5050
cd simgrid
51-
cmake -B build -Denable_smpi=OFF -Denable_model-checking=OFF -DCMAKE_INSTALL_PREFIX=/opt/simgrid
51+
cmake -B build -Denable_smpi=OFF -Denable_model-checking=OFF -Denable_python=ON -DCMAKE_INSTALL_PREFIX=/opt/simgrid
5252
cmake --build build -j$(nproc)
5353
sudo cmake --install build
5454
@@ -88,7 +88,7 @@ jobs:
8888
- name: Build and test with coverage
8989
env:
9090
LD_LIBRARY_PATH: /opt/simgrid/lib:/opt/fsmod/lib:/usr/local/lib
91-
PYTHONPATH: /usr/local/lib/python3.12/dist-packages/
91+
PYTHONPATH: /opt/simgrid/lib/python3.12/site-packages:/usr/local/lib/python3.12/dist-packages
9292
CMAKE_PREFIX_PATH: /opt/simgrid:/opt/fsmod:/opt/gtest
9393
run: |
9494
cmake -B build -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug

.github/workflows/weekly-checks.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ jobs:
4747
id: cache-simgrid
4848
with:
4949
path: /opt/simgrid
50-
key: ${{ runner.os }}-simgrid-${{ hashFiles('.github/workflows/weekly-checks.yml') }}
50+
key: ${{ runner.os }}-simgrid-python-${{ hashFiles('.github/workflows/weekly-checks.yml') }}
5151

5252
- name: Install SimGrid
5353
if: steps.cache-simgrid.outputs.cache-hit != 'true'
5454
run: |
5555
git clone --depth 1 https://framagit.org/simgrid/simgrid.git
5656
cd simgrid
57-
cmake -B build -Denable_smpi=OFF -Denable_model-checking=OFF -DCMAKE_INSTALL_PREFIX=/opt/simgrid
57+
cmake -B build -Denable_smpi=OFF -Denable_model-checking=OFF -Denable_python=ON -DCMAKE_INSTALL_PREFIX=/opt/simgrid
5858
cmake --build build -j$(nproc)
5959
sudo cmake --install build
6060
@@ -107,7 +107,7 @@ jobs:
107107
- name: Run tests with ${{ matrix.sanitizer.name }}
108108
env:
109109
LD_LIBRARY_PATH: /opt/simgrid/lib:/opt/fsmod/lib:/usr/local/lib
110-
PYTHONPATH: /usr/local/lib/python3.12/dist-packages/
110+
PYTHONPATH: /opt/simgrid/lib/python3.12/site-packages:/usr/local/lib/python3.12/dist-packages
111111
run: |
112112
export ${{ matrix.sanitizer.env_options }}
113113
cd build
@@ -154,14 +154,14 @@ jobs:
154154
id: cache-simgrid
155155
with:
156156
path: /opt/simgrid
157-
key: ${{ runner.os }}-simgrid-${{ hashFiles('.github/workflows/weekly-checks.yml') }}
157+
key: ${{ runner.os }}-simgrid-python-${{ hashFiles('.github/workflows/weekly-checks.yml') }}
158158

159159
- name: Install SimGrid
160160
if: steps.cache-simgrid.outputs.cache-hit != 'true'
161161
run: |
162162
git clone --depth 1 https://framagit.org/simgrid/simgrid.git
163163
cd simgrid
164-
cmake -B build -Denable_smpi=OFF -Denable_model-checking=OFF -DCMAKE_INSTALL_PREFIX=/opt/simgrid
164+
cmake -B build -Denable_smpi=OFF -Denable_model-checking=OFF -Denable_python=ON -DCMAKE_INSTALL_PREFIX=/opt/simgrid
165165
cmake --build build -j$(nproc)
166166
sudo cmake --install build
167167

0 commit comments

Comments
 (0)