Skip to content

Commit 8021d1a

Browse files
committed
[ci] Build ConstraintGeometry - no installation
1 parent 2030b82 commit 8021d1a

File tree

1 file changed

+39
-31
lines changed

1 file changed

+39
-31
lines changed

.github/workflows/ci.yml

Lines changed: 39 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ jobs:
2121
sofa_root: ${{ github.workspace }}/sofa
2222
sofa_version: ${{ matrix.sofa_branch }}
2323
sofa_scope: 'standard'
24-
- name: Checkout source code
24+
25+
- name: Checkout CollisionAlgorithm
2526
uses: actions/checkout@v2
2627
with:
2728
path: ${{ env.WORKSPACE_SRC_PATH }}
2829

29-
- name: Build and install
30+
- name: Build and install CollisionAlgorithm
3031
id: build-install
3132
shell: bash
3233
run: |
@@ -55,6 +56,35 @@ jobs:
5556
echo ${CCACHE_BASEDIR}
5657
ccache -s
5758
fi
59+
60+
- name: Checkout ConstraintGeometry
61+
uses: actions/checkout@v2
62+
with:
63+
repository: InfinyTech3D/ConstraintGeometry
64+
path: downstream/ConstraintGeometry
65+
66+
- name: Build ConstraintGeometry
67+
shell: bash
68+
run: |
69+
mkdir -p downstream/ConstraintGeometry/build
70+
if [[ "$RUNNER_OS" == "Windows" ]]; then
71+
cmd //c "${{ steps.sofa.outputs.vs_vsdevcmd }} \
72+
&& cd /d %GITHUB_WORKSPACE%/downstream/ConstraintGeometry/build \
73+
&& cmake \
74+
-GNinja \
75+
-DCMAKE_PREFIX_PATH=$SOFA_ROOT/lib/cmake;%WORKSPACE_INSTALL_PATH%/lib/cmake \
76+
-DCMAKE_BUILD_TYPE=Release \
77+
.. \
78+
&& ninja"
79+
else
80+
cd downstream/ConstraintGeometry/build
81+
cmake \
82+
-GNinja \
83+
-DCMAKE_PREFIX_PATH="$SOFA_ROOT/lib/cmake;$WORKSPACE_INSTALL_PATH/lib/cmake" \
84+
-DCMAKE_BUILD_TYPE=Release \
85+
..
86+
ninja
87+
fi
5888
5989
- name: Sanitize artifact name
6090
id: sanitize
@@ -82,36 +112,14 @@ jobs:
82112
name: ${{ steps.sanitize.outputs.artifact_name }}
83113
path: ${{ env.WORKSPACE_ARTIFACT_PATH }}
84114

85-
- name: Checkout ConstraintGeometry
86-
uses: actions/checkout@v2
87-
with:
88-
repository: InfinyTech3D/ConstraintGeometry
89-
path: deps/ConstraintGeometry
90-
91-
- name: Build and install ConstraintGeometry
92-
shell: bash
115+
- name: Debug install tree
116+
if: runner.os == 'Linux'
93117
run: |
94-
mkdir -p deps/ConstraintGeometry/build
95-
if [[ "$RUNNER_OS" == "Windows" ]]; then
96-
cmd //c "${{ steps.sofa.outputs.vs_vsdevcmd }} \
97-
&& cd /d %GITHUB_WORKSPACE%/deps/ConstraintGeometry/build \
98-
&& cmake \
99-
-GNinja \
100-
-DCMAKE_PREFIX_PATH=$SOFA_ROOT/lib/cmake;%GITHUB_WORKSPACE%/install/CollisionAlgorithm \
101-
-DCMAKE_BUILD_TYPE=Release \
102-
-DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%/install/ConstraintGeometry \
103-
../src \
104-
&& ninja install"
105-
else
106-
cd deps/ConstraintGeometry/build
107-
cmake \
108-
-GNinja \
109-
-DCMAKE_PREFIX_PATH="$SOFA_ROOT/lib/cmake;$GITHUB_WORKSPACE/install/CollisionAlgorithm" \
110-
-DCMAKE_BUILD_TYPE=Release \
111-
-DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/install/ConstraintGeometry \
112-
../src
113-
ninja install
114-
fi
118+
echo "=== Listing Workspace ==="
119+
find $GITHUB_WORKSPACE -maxdepth 3 -not -path '*/.*' -type d -print
120+
echo "=== Listing cmake files ==="
121+
find $GITHUB_WORKSPACE -name "*Config.cmake" -print
122+
115123
116124
- name: Set env vars for tests
117125
shell: bash

0 commit comments

Comments
 (0)