Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 199889a

Browse files
committedMar 13, 2025·
[ci] Linux: Expose "bin/" which now contains the binding to PYTHONPATH
1 parent 065e2c7 commit 199889a

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed
 

‎.github/workflows/continuous-integration.yml

+10-5
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
meshroom_avBranch=$(git ls-remote --heads https://github.com/alicevision/Meshroom.git $GITHUB_HEAD_REF | cut -f 1)
103103
if [ $meshroom_avBranch != "" ]; then git checkout $meshroom_avBranch; echo "Use Meshroom/$GITHUB_HEAD_REF"; fi
104104
export MESHROOM_INSTALL_DIR=$PWD
105-
export PYTHONPATH=$PWD:${ALICEVISION_ROOT}:${PYTHONPATH}
105+
export PYTHONPATH=$PWD:${ALICEVISION_ROOT}/bin:${PYTHONPATH}
106106
export PATH=$PATH:${ALICEVISION_ROOT}/bin
107107
export LD_LIBRARY_PATH=${ALICEVISION_ROOT}/lib:${ALICEVISION_ROOT}/lib64:${DEPS_INSTALL_DIR}/lib64:${DEPS_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
108108
mkdir ./outputData
@@ -121,7 +121,7 @@ jobs:
121121
cd SfM_quality_evaluation/
122122
# checkout a specific commit to ensure repeatability
123123
git checkout 36e3bf2d05c64d1726cb4a0e770923794f203f98
124-
export PYTHONPATH=${ALICEVISION_ROOT}:${PYTHONPATH}
124+
export PYTHONPATH=${ALICEVISION_ROOT}/bin:${PYTHONPATH}
125125
export LD_LIBRARY_PATH=${ALICEVISION_ROOT}/lib:${ALICEVISION_ROOT}/lib64:${DEPS_INSTALL_DIR}/lib64:${DEPS_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
126126
echo "ldd aliceVision_cameraInit"
127127
ldd ${ALICEVISION_ROOT}/bin/aliceVision_cameraInit
@@ -130,7 +130,7 @@ jobs:
130130
131131
- name: Python Binding - Unit Tests
132132
run: |
133-
export PYTHONPATH=${ALICEVISION_ROOT}:${PYTHONPATH}
133+
export PYTHONPATH=${ALICEVISION_ROOT}/bin:${PYTHONPATH}
134134
export LD_LIBRARY_PATH=${ALICEVISION_ROOT}/lib:${ALICEVISION_ROOT}/lib64:${DEPS_INSTALL_DIR}/lib64:${DEPS_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
135135
pip3 install pytest
136136
pytest ./pyTests
@@ -152,6 +152,11 @@ jobs:
152152
with:
153153
submodules: recursive
154154

155+
- name: Test setting env var
156+
run: |
157+
set '${{ env.PYTHONPATH }}'
158+
echo ${{ env.PYTHONPATH }}
159+
155160
- name: vcpkg - Clone repository
156161
# Uses a specific version of vcpkg
157162
run: |
@@ -246,8 +251,8 @@ jobs:
246251

247252
- name: Python Binding - Unit Tests
248253
run: |
249-
dir ${{ env.ALICEVISION_ROOT }}
250-
set PYTHONPATH=${{ env.ALICEVISION_ROOT }}\bundle\bin;${{ env.PYTHONPATH}}
254+
set PYTHONPATH=${{ env.ALICEVISION_ROOT }}/bundle/bin
255+
echo %PYTHONPATH%
251256
${{ env.VCPKG_ROOT }}\installed\x64-windows\tools\python3\python -m pytest ./pyTests
252257
253258
- name: Unit Tests

0 commit comments

Comments
 (0)
Please sign in to comment.