Skip to content

Commit ae332e2

Browse files
committed
unify path flattening for all OS
1 parent cb1d0bc commit ae332e2

1 file changed

Lines changed: 12 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,18 @@ jobs:
5252
..
5353
ninja install
5454
fi
55-
# Flatten the CollisionAlgorithm install structure
56-
mkdir -p $GITHUB_WORKSPACE/install/CollisionAlgorithm/include/CollisionAlgorithm
57-
mv $GITHUB_WORKSPACE/install/CollisionAlgorithm/include/include/CollisionAlgorithm/CollisionAlgorithm/src/* \
58-
$GITHUB_WORKSPACE/install/CollisionAlgorithm/include/CollisionAlgorithm/
59-
rm -rf $GITHUB_WORKSPACE/install/CollisionAlgorithm/include/include
55+
# Move the CollisionAlgorithm installation to match ConstraintGeometry CMake
56+
SRC_PATH="$GITHUB_WORKSPACE/install/CollisionAlgorithm/include/include/CollisionAlgorithm/CollisionAlgorithm/src"
57+
DEST_PATH="$GITHUB_WORKSPACE/install/CollisionAlgorithm/include/CollisionAlgorithm"
58+
# If Windows, convert paths
59+
if [[ "$RUNNER_OS" == "Windows" ]]; then
60+
SRC_PATH=$(cygpath -u "$SRC_PATH")
61+
DEST_PATH=$(cygpath -u "$DEST_PATH")
62+
fi
63+
# Flatten install structure
64+
mkdir -p "$DEST_PATH"
65+
mv "$SRC_PATH"/* "$DEST_PATH"/
66+
rm -rf "$GITHUB_WORKSPACE/install/CollisionAlgorithm/include/include"
6067
6168
- name: Checkout source code
6269
uses: actions/checkout@v2

0 commit comments

Comments
 (0)