Skip to content

Commit 90fc8ff

Browse files
committed
[ci] Buid CollisionAlgorithm in environment before building ConstraintGeometry
WIP: It might be better to rework the CollisionAlgorithm/CMakeLists.txt instead of moving files through the CI
1 parent d746b04 commit 90fc8ff

1 file changed

Lines changed: 23 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,26 @@ jobs:
2525
- name: Checkout dependency source code
2626
uses: actions/checkout@v2
2727
with:
28-
path: InfinyTech3D/CollisionAlgorithm
28+
path: deps/CollisionAlgorithm
2929
repository: InfinyTech3D/CollisionAlgorithm
30+
31+
- name: Build and install CollisionAlgorithm
32+
shell: bash
33+
run: |
34+
mkdir -p deps/CollisionAlgorithm/build
35+
cd deps/CollisionAlgorithm/build
36+
cmake \
37+
-GNinja \
38+
-DCMAKE_PREFIX_PATH=$SOFA_ROOT/lib/cmake \
39+
-DCMAKE_BUILD_TYPE=Release \
40+
-DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/install/CollisionAlgorithm \
41+
..
42+
ninja install
43+
# Flatten the CollisionAlgorithm install structure
44+
mkdir -p $GITHUB_WORKSPACE/install/CollisionAlgorithm/include/CollisionAlgorithm
45+
mv $GITHUB_WORKSPACE/install/CollisionAlgorithm/include/include/CollisionAlgorithm/CollisionAlgorithm/src/* \
46+
$GITHUB_WORKSPACE/install/CollisionAlgorithm/include/CollisionAlgorithm/
47+
rm -rf $GITHUB_WORKSPACE/install/CollisionAlgorithm/include/include
3048
3149
- name: Checkout source code
3250
uses: actions/checkout@v2
@@ -42,23 +60,23 @@ jobs:
4260
&& cd /d $WORKSPACE_BUILD_PATH \
4361
&& cmake \
4462
-GNinja \
45-
-DCMAKE_PREFIX_PATH="$SOFA_ROOT/lib/cmake" \
63+
-DCMAKE_PREFIX_PATH="$SOFA_ROOT/lib/cmake;$GITHUB_WORKSPACE/install/CollisionAlgorithm" \
4664
-DCMAKE_BUILD_TYPE=Release \
4765
-DCMAKE_INSTALL_PREFIX="$WORKSPACE_INSTALL_PATH" \
4866
../src \
49-
&& ninja install"
67+
&& ninja -v install"
5068
else
5169
cd "$WORKSPACE_BUILD_PATH"
5270
ccache -z
5371
cmake \
5472
-GNinja \
5573
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
5674
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
57-
-DCMAKE_PREFIX_PATH=$SOFA_ROOT/lib/cmake \
75+
-DCMAKE_PREFIX_PATH="$SOFA_ROOT/lib/cmake;$GITHUB_WORKSPACE/install/CollisionAlgorithm" \
5876
-DCMAKE_BUILD_TYPE=Release \
5977
-DCMAKE_INSTALL_PREFIX="$WORKSPACE_INSTALL_PATH" \
6078
../src
61-
ninja install
79+
ninja -v install
6280
echo ${CCACHE_BASEDIR}
6381
ccache -s
6482
fi

0 commit comments

Comments
 (0)