7272 if : steps.cache-blender.outputs.cache-hit != 'true'
7373 run : python scripts/blender_downloader.py ${{ matrix.blender.version }} -o blender
7474
75- - name : Check if mitsuba_version branch
76- id : check-branch
77- shell : bash
78- run : |
79- if [[ "${{ github.head_ref || github.ref_name }}" == mitsuba_version* ]]; then
80- echo "::set-output name=is_mitsuba_version::true"
81- else
82- echo "::set-output name=is_mitsuba_version::false"
83- fi
84-
85- - name : Build Mitsuba if needed (Ubuntu)
86- if : steps.check-branch.outputs.is_mitsuba_version == 'true' && matrix.environment.os == 'ubuntu-latest'
87- uses : ./.github/workflows/build_mitsuba_ubuntu
88- with :
89- github_token : ${{ secrets.GITHUB_TOKEN }}
90-
91- - name : Build Mitsuba if needed (Windows)
92- if : steps.check-branch.outputs.is_mitsuba_version == 'true' && matrix.environment.os == 'windows-latest'
93- uses : ./.github/workflows/build_mitsuba_windows
94-
9575 - name : Install Blender dependencies
9676 shell : bash
9777 run : |
@@ -100,23 +80,12 @@ jobs:
10080 ./$BLENDER_PYTHON -m ensurepip
10181 ./$BLENDER_PYTHON -m pip install -U pip
10282 ./$BLENDER_PYTHON -m pip install --upgrade pytest pytest-cov
103- if [[ "${{ steps.check-branch.outputs.is_mitsuba_version }}" == "true" ]]; then
104- echo "Using local Mitsuba build"
105- export PYTHONPATH="$PWD/mitsuba3/build/python:$PYTHONPATH"
106- else
107- echo "Using PyPI Mitsuba"
108- ./$BLENDER_PYTHON -m pip install mitsuba==${{ matrix.environment.mitsuba-version }} --force-reinstall
109- fi
83+ ./$BLENDER_PYTHON -m pip install mitsuba==${{ matrix.environment.mitsuba-version }} --force-reinstall
11084
11185 - name : Run Addon test suite
11286 shell : bash
11387 run : |
11488 BLENDER_EXECUTABLE=$(find blender/ -maxdepth 1 -regextype posix-extended -regex '.*blender(.exe)?' -print -quit)
11589 echo "Blender Executable is $BLENDER_EXECUTABLE"
116- if [[ "${{ steps.check-branch.outputs.is_mitsuba_version }}" == "true" ]]; then
117- echo "Running tests with local Mitsuba build"
118- ./$BLENDER_EXECUTABLE -b -noaudio --factory-startup --python scripts/run_tests.py --mitsuba "$PWD/mitsuba3/build" -- -v --cov=mitsuba-blender
119- else
120- echo "Running tests with PyPI Mitsuba"
121- ./$BLENDER_EXECUTABLE -b -noaudio --factory-startup --python scripts/run_tests.py -- -v --cov=mitsuba-blender
122- fi
90+ ./$BLENDER_EXECUTABLE -b -noaudio --factory-startup --python scripts/run_tests.py -- -v --cov=mitsuba-blender
91+
0 commit comments