Skip to content

Commit 08f167c

Browse files
committed
[ci] Update directory for the build
1 parent 9bc36cf commit 08f167c

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@ jobs:
117117
- name: Make ConstraintGeometry visible for tests
118118
shell: bash
119119
run: |
120-
# The test action sets SOFA_PLUGIN_PATH to build_dir/lib (or /bin on Windows) only.
121-
# Copying the ConstraintGeometry library there makes it discoverable without
122-
# affecting the release artifact (which is uploaded from WORKSPACE_INSTALL_PATH).
120+
# The test action sets SOFA_PLUGIN_PATH to build_dir/bin (Windows) or build_dir/lib (Linux/macOS).
121+
# We use WORKSPACE_ARTIFACT_PATH as build_dir because its bin/ and lib/ subdirectories already
122+
# exist (populated by the artifact download step) and contain CollisionAlgorithm.
123+
# The release artifact was already uploaded before this step, so adding ConstraintGeometry
124+
# here does not contaminate the CollisionAlgorithm release.
123125
if [[ "$RUNNER_OS" == "Windows" ]]; then
124-
# build/bin does not exist; SOFA silently skips it and scans build/ directly.
125-
# CollisionAlgorithm.dll lives in build/, so we place ConstraintGeometry alongside it.
126-
cp $GITHUB_WORKSPACE/downstream/ConstraintGeometry/install/bin/ConstraintGeometry.dll $WORKSPACE_BUILD_PATH/
126+
cp $GITHUB_WORKSPACE/downstream/ConstraintGeometry/install/bin/ConstraintGeometry.dll $WORKSPACE_ARTIFACT_PATH/bin/
127127
else
128-
cp $GITHUB_WORKSPACE/downstream/ConstraintGeometry/install/lib/libConstraintGeometry.* $WORKSPACE_BUILD_PATH/lib/
128+
cp $GITHUB_WORKSPACE/downstream/ConstraintGeometry/install/lib/libConstraintGeometry.* $WORKSPACE_ARTIFACT_PATH/lib/
129129
fi
130130
131131
- name: Launch test
@@ -135,7 +135,7 @@ jobs:
135135
sofa_root: ${{ github.workspace }}/sofa
136136
sofa_version: ${{ steps.sofa.outputs.sofa_version }}
137137
src_dir: ${{ env.WORKSPACE_SRC_PATH }}
138-
build_dir: ${{ env.WORKSPACE_BUILD_PATH }}
138+
build_dir: ${{ env.WORKSPACE_ARTIFACT_PATH }}
139139
python_exe: ${{ steps.sofa.outputs.python_exe }}
140140
output_dir: ${{ github.workspace }}/tests-results_dir
141141
nb_parallel_threads: '4'

0 commit comments

Comments
 (0)