Skip to content

Commit 8458e4d

Browse files
authored
Merge pull request #2020 from alicevision/dev/updatePipelines
[meshroom] Update pipeline templates
2 parents bdb26b1 + 7e3a8e6 commit 8458e4d

File tree

5 files changed

+1370
-58
lines changed

5 files changed

+1370
-58
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,24 @@ jobs:
147147
cd mrBlenderSfmRenderer
148148
mrBlenderSfmRenderer_avBranch=$(git ls-remote --heads https://github.com/meshroomHub/mrBlenderSfmRenderer.git $GITHUB_HEAD_REF | cut -f 1)
149149
if [ $mrBlenderSfmRenderer_avBranch != "" ]; then git checkout $mrBlenderSfmRenderer_avBranch; echo "Use mrBlenderSfmRenderer/$GITHUB_HEAD_REF"; fi
150+
cd ..
151+
152+
# Clone and checkout mrIntrinsicImageDecomposition, align the branch if necessary
153+
git clone https://github.com/meshroomHub/mrIntrinsicImageDecomposition.git
154+
cd mrIntrinsicImageDecomposition
155+
mrIntrinsicImageDecomposition_avBranch=$(git ls-remote --heads https://github.com/meshroomHub/mrIntrinsicImageDecomposition.git $GITHUB_HEAD_REF | cut -f 1)
156+
if [ $mrIntrinsicImageDecomposition_avBranch != "" ]; then git checkout $mrIntrinsicImageDecomposition_avBranch; echo "Use mrIntrinsicImageDecomposition/$GITHUB_HEAD_REF"; fi
157+
cd ..
158+
159+
# Clone and checkout mrRoma, align the branch if necessary
160+
git clone https://github.com/meshroomHub/mrRoma.git
161+
cd mrRoma
162+
mrRoma_avBranch=$(git ls-remote --heads https://github.com/meshroomHub/mrRoma $GITHUB_HEAD_REF | cut -f 1)
163+
if [ $mrRoma_avBranch != "" ]; then git checkout $mrRoma_avBranch; echo "Use mrRoma/$GITHUB_HEAD_REF"; fi
150164
cd ../Meshroom/
151165
152166
export MESHROOM_INSTALL_DIR=$PWD
153-
export MESHROOM_NODES_PATH=${MESHROOM_NODES_PATH}:${ALICEVISION_ROOT}/share/meshroom:$PWD/../mrSegmentation/meshroom:$PWD/../mrBlenderSfmRenderer/meshroom
167+
export MESHROOM_NODES_PATH=${MESHROOM_NODES_PATH}:${ALICEVISION_ROOT}/share/meshroom:$PWD/../mrSegmentation/meshroom:$PWD/../mrBlenderSfmRenderer/meshroom:$PWD/../mrIntrinsicImageDecomposition/meshroom:$PWD/../mrRoma/meshroom
154168
export MESHROOM_PIPELINE_TEMPLATES_PATH=${MESHROOM_PIPELINE_TEMPLATES_PATH}:${ALICEVISION_ROOT}/share/meshroom
155169
export PYTHONPATH=$PWD:${ALICEVISION_ROOT}/lib64/python:${ALICEVISION_ROOT}/lib/python:${PYTHONPATH}
156170
export PATH=$PATH:${ALICEVISION_ROOT}/bin

0 commit comments

Comments
 (0)