Skip to content

Commit 7b08592

Browse files
committed
[ci] Buid CollisionAlgorithm in environment before building ConstraintGeometry
1 parent b1c3a5c commit 7b08592

1 file changed

Lines changed: 25 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
os: [ubuntu-22.04, macos-14, windows-2022]
13+
os: [ubuntu-22.04] #, macos-14, windows-2022]
1414
sofa_branch: [master]
1515

1616
steps:
@@ -25,8 +25,27 @@ 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+
# Fix include path for ConstraintGeometry
44+
mkdir -p $GITHUB_WORKSPACE/install/CollisionAlgorithm/include/CollisionAlgorithm
45+
rsync -a $GITHUB_WORKSPACE/install/CollisionAlgorithm/include/include/CollisionAlgorithm/ \
46+
$GITHUB_WORKSPACE/install/CollisionAlgorithm/include/CollisionAlgorithm/
47+
rm -rf $GITHUB_WORKSPACE/install/CollisionAlgorithm/include/include
48+
ls -R $GITHUB_WORKSPACE/install/CollisionAlgorithm/include
3049
3150
- name: Checkout source code
3251
uses: actions/checkout@v2
@@ -42,23 +61,23 @@ jobs:
4261
&& cd /d $WORKSPACE_BUILD_PATH \
4362
&& cmake \
4463
-GNinja \
45-
-DCMAKE_PREFIX_PATH="$SOFA_ROOT/lib/cmake" \
64+
-DCMAKE_PREFIX_PATH="$SOFA_ROOT/lib/cmake;$GITHUB_WORKSPACE/install/CollisionAlgorithm" \
4665
-DCMAKE_BUILD_TYPE=Release \
4766
-DCMAKE_INSTALL_PREFIX="$WORKSPACE_INSTALL_PATH" \
4867
../src \
49-
&& ninja install"
68+
&& ninja -v install"
5069
else
5170
cd "$WORKSPACE_BUILD_PATH"
5271
ccache -z
5372
cmake \
5473
-GNinja \
5574
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
5675
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
57-
-DCMAKE_PREFIX_PATH=$SOFA_ROOT/lib/cmake \
76+
-DCMAKE_PREFIX_PATH="$SOFA_ROOT/lib/cmake;$GITHUB_WORKSPACE/install/CollisionAlgorithm" \
5877
-DCMAKE_BUILD_TYPE=Release \
5978
-DCMAKE_INSTALL_PREFIX="$WORKSPACE_INSTALL_PATH" \
6079
../src
61-
ninja install
80+
ninja -v install
6281
echo ${CCACHE_BASEDIR}
6382
ccache -s
6483
fi

0 commit comments

Comments
 (0)