Skip to content

Commit 3fdb5f0

Browse files
committed
[ci] Switch to installing ConstraintGeometry and export library paths for macos and ubuntu
1 parent 7043b08 commit 3fdb5f0

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,18 @@ jobs:
7474
-GNinja \
7575
-DCMAKE_PREFIX_PATH=$SOFA_ROOT/lib/cmake;%WORKSPACE_INSTALL_PATH%/lib/cmake \
7676
-DCMAKE_BUILD_TYPE=Release \
77+
-DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%/downstream/ConstraintGeometry/install \
7778
.. \
78-
&& ninja"
79+
&& ninja install"
7980
else
8081
cd downstream/ConstraintGeometry/build
8182
cmake \
8283
-GNinja \
8384
-DCMAKE_PREFIX_PATH="$SOFA_ROOT/lib/cmake;$WORKSPACE_INSTALL_PATH/lib/cmake" \
8485
-DCMAKE_BUILD_TYPE=Release \
86+
-DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/downstream/ConstraintGeometry/install \
8587
..
86-
ninja
88+
ninja install
8789
fi
8890
8991
- name: Sanitize artifact name
@@ -126,11 +128,11 @@ jobs:
126128
fi
127129
128130
if [[ "$RUNNER_OS" == "macOS" ]]; then
129-
echo "DYLD_LIBRARY_PATH=$WORKSPACE_ARTIFACT_PATH/lib:$SOFA_ROOT/lib:$SOFA_ROOT/plugins/SofaPython3/lib:$DYLD_LIBRARY_PATH" | tee -a $GITHUB_ENV
131+
echo "DYLD_LIBRARY_PATH=$WORKSPACE_ARTIFACT_PATH/lib:$SOFA_ROOT/lib:$GITHUB_WORKSPACE/downstream/ConstraintGeometry/install/lib:$SOFA_ROOT/plugins/SofaPython3/lib:$DYLD_LIBRARY_PATH" | tee -a $GITHUB_ENV
130132
fi
131133
132134
if [[ "$RUNNER_OS" == "Linux" ]]; then
133-
echo "LD_LIBRARY_PATH=$WORKSPACE_ARTIFACT_PATH/lib:$SOFA_ROOT/lib:$SOFA_ROOT/plugins/SofaPython3/lib:$LD_LIBRARY_PATH" | tee -a $GITHUB_ENV
135+
echo "LD_LIBRARY_PATH=$WORKSPACE_ARTIFACT_PATH/lib:$SOFA_ROOT/lib:$GITHUB_WORKSPACE/downstream/ConstraintGeometry/install/lib:$SOFA_ROOT/plugins/SofaPython3/lib:$LD_LIBRARY_PATH" | tee -a $GITHUB_ENV
134136
fi
135137
136138
# - name: Check environment for tests

0 commit comments

Comments
 (0)