Rewrite the mitsuba-blender addon

.github/workflows/nightly_release.yml

@@ -1,35 +1,34 @@
-# This workflow runs on every commit on the master branch. It runs the test suite
-# and packages the add-on. It then updates the "nightly release" in the release section
-# of the repository.
+# Runs on every commit on the master branch. It runs the test suite, builds
+# the extension zips, and updates the rolling "nightly" release.
 name: Nightly Release
 
-# Triggers the workflow on pushes on the master branch
 on:
   push:
     branches: [master]
 
-# Workflow steps
 jobs:
   tests:
     uses: ./.github/workflows/test.yml
 
-  package:
-    name: "Package Release"
+  release:
+    name: "Publish nightly release"
     needs: [tests]
-    runs-on: "ubuntu-latest"
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
 
     steps:
     - name: Git checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
-    - name: Setup Python
-      uses: actions/setup-python@v2
-
-    - name: Create package
-      run: python release/package.py
+    - name: Download the extension zips
+      uses: actions/download-artifact@v4
+      with:
+        name: extension-zips
+        path: dist
 
     - name: Advance `latest` tag
-      uses: actions/github-script@v6
+      uses: actions/github-script@v7
       with:
         script: |
           try {
@@ -55,7 +54,7 @@ jobs:
         prerelease: true
         allowUpdates: true
         replacesArtifacts: true
-        artifacts: "mitsuba-blender.zip"
+        artifacts: "dist/*.zip"
         artifactErrorsFailBuild: true
         tag: "latest"
         bodyFile: "release/nightly_release_body.md"

.github/workflows/release.yml

@@ -1,43 +1,38 @@
-# This workflow runs on every pushed version tags. It runs the tests and
-# packages the release. It then creates a new entry in the release section
-# of the repo.
+# Runs on every pushed version tag. It runs the test suite, builds the
+# extension zips, and creates a new draft entry in the release section.
 name: Release
 
-# Triggers the workflow on tags with a specific format
 on:
   push:
     tags:
       - v*
 
-# Workflow steps
 jobs:
   tests:
     uses: ./.github/workflows/test.yml
-  
-  package:
-    name: "Package Release"
+
+  release:
+    name: "Publish draft release"
     needs: [tests]
-    runs-on: "ubuntu-latest"
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
 
     steps:
     - name: Git checkout
-      uses: actions/checkout@v2
-
-    - name: Query Git Tag
-      id: git-tag
-      run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
+      uses: actions/checkout@v4
 
-    - name: Setup Python
-      uses: "actions/setup-python@v2"
-
-    - name: Create package
-      run: python release/package.py
+    - name: Download the extension zips
+      uses: actions/download-artifact@v4
+      with:
+        name: extension-zips
+        path: dist
 
     - name: Create GitHub draft release
       uses: ncipollo/release-action@v1
       with:
-        artifacts: "mitsuba-blender.zip"
+        artifacts: "dist/*.zip"
         artifactErrorsFailBuild: true
         bodyFile: "release/release_body_template.md"
         draft: true
-        name: "Mitsuba-Blender ${{ steps.git-tag.outputs.tag }}"
+        name: "Mitsuba-Blender ${{ github.ref_name }}"

.github/workflows/test.yml

@@ -1,91 +1,109 @@
-# This workflow runs on every pull request and push on any other branch other than master.
-# It executes the test suite on different environments to validate the add-on.
+# Runs the test suite inside headless Blender and builds the extension zip.
 name: Test suite
 
-# Triggers the workflow on pull requests created for the master branch as well as
-# push events on other branches than master.
 on:
-  push:
-    branches:
-      - master
+  # Master pushes are covered by nightly_release.yml, which calls this
+  # workflow; a push trigger here would run the whole matrix twice.
+  # No branch filter, so pull requests against any base branch run the suite.
   pull_request:
-    branches: [ master ]
   workflow_call:
+  schedule:
+    # The weekly run additionally tests the daily Blender development build.
+    - cron: '0 5 * * 1'
+
+# Supersede in-flight runs when a pull request is updated.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
-# Workflow steps
 jobs:
-  build:
-    name: "${{ matrix.environment.os }} | Blender ${{ matrix.blender.version }}"
-    runs-on: ${{ matrix.environment.os }}
+  test:
+    name: "Blender ${{ matrix.blender-version }}"
+    runs-on: ubuntu-latest
+    # The daily Blender build only runs on the weekly schedule, so letting it
+    # fail the (scheduled) workflow is the early-warning signal we want; it
+    # never gates pull requests or releases.
     strategy:
-      # Do not stop other jobs if one fails
       fail-fast: false
       matrix:
-        environment:
-        - {
-          os: "ubuntu-latest",
-          mitsuba-version: "3.7.1"
-        }
-        - {
-          os: "windows-latest",
-          mitsuba-version: "3.7.1"
-        }
-        blender:
-        - {
-          version: "3.6",
-          python-version: "3.10"
-        }
-        - {
-          version: "4.2",
-          python-version: "3.11"
-        }
-        - {
-          version: "4.5",
-          python-version: "3.11"
-        }
+        blender-version: ${{ fromJSON(github.event_name == 'schedule' && '["4.2", "4.5", "daily"]' || '["4.2", "4.5"]') }}
+
     steps:
     - name: Git checkout
       uses: actions/checkout@v4
 
     - name: Setup Python
-      uses: "actions/setup-python@v2"
+      uses: actions/setup-python@v5
       with:
-        python-version: ${{ matrix.blender.python-version }}
+        python-version: '3.11'
 
-    - name: Install Python dependencies
+    - name: Install host Python dependencies
       run: python -m pip install --upgrade requests
 
     - name: Retrieve Blender full version
       id: blender-version
-      shell: bash
-      run: |
-        echo "::set-output name=BLENDER_VERSION::$(python scripts/blender_downloader.py ${{ matrix.blender.version }} --print-version)"
+      run: echo "version=$(python scripts/blender_downloader.py ${{ matrix.blender-version }} --print-version)" >> "$GITHUB_OUTPUT"
 
     - name: Cache Blender archive
       id: cache-blender
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: blender
-        key: ${{ matrix.environment.os }}-${{ steps.blender-version.outputs.BLENDER_VERSION }}-v1
+        key: ${{ runner.os }}-${{ steps.blender-version.outputs.version }}
 
     - name: Download Blender
       if: steps.cache-blender.outputs.cache-hit != 'true'
-      run: python scripts/blender_downloader.py ${{ matrix.blender.version }} -o blender
+      run: python scripts/blender_downloader.py ${{ matrix.blender-version }} -o blender
 
-    - name: Install Blender dependencies
-      shell: bash
-      run: |
-        BLENDER_PYTHON=$(find blender/ -regextype posix-extended -regex '.*bin\/python(.exe|[0-9].[0-9]{1,2}m?)' -print -quit)
-        echo "Blender Python is $BLENDER_PYTHON"
-        ./$BLENDER_PYTHON -m ensurepip
-        ./$BLENDER_PYTHON -m pip install -U pip
-        ./$BLENDER_PYTHON -m pip install --upgrade pytest pytest-cov
-        ./$BLENDER_PYTHON -m pip install mitsuba==${{ matrix.environment.mitsuba-version }} --force-reinstall
-
-    - name: Run Addon test suite
-      shell: bash
+    - name: Install test dependencies into Blender's Python
       run: |
-        BLENDER_EXECUTABLE=$(find blender/ -maxdepth 1 -regextype posix-extended -regex '.*blender(.exe)?' -print -quit)
-        echo "Blender Executable is $BLENDER_EXECUTABLE"
-        ./$BLENDER_EXECUTABLE -b -noaudio --factory-startup --python scripts/run_tests.py -- -v --cov=mitsuba-blender
+        blender_python=$(find blender -path '*/python/bin/python3*' -type f -print -quit)
+        echo "Blender Python is $blender_python"
+        "$blender_python" -m ensurepip
+        "$blender_python" -m pip install --upgrade pip
+        "$blender_python" -m pip install pytest mitsuba==3.9.0
+
+    - name: Run the test suite
+      run: BLENDER="$PWD/blender/blender" python tests/run.py --all
+
+  package:
+    name: Package extension
+    needs: test
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Git checkout
+      uses: actions/checkout@v4
+
+    - name: Setup Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.11'
+
+    - name: Install host Python dependencies
+      run: python -m pip install --upgrade requests
+
+    - name: Retrieve Blender full version
+      id: blender-version
+      run: echo "version=$(python scripts/blender_downloader.py 4.2 --print-version)" >> "$GITHUB_OUTPUT"
+
+    - name: Cache Blender archive
+      id: cache-blender
+      uses: actions/cache@v4
+      with:
+        path: blender
+        key: ${{ runner.os }}-${{ steps.blender-version.outputs.version }}
 
+    - name: Download Blender
+      if: steps.cache-blender.outputs.cache-hit != 'true'
+      run: python scripts/blender_downloader.py 4.2 -o blender
+
+    - name: Build the extension with bundled wheels
+      run: python release/build_extension.py --blender blender/blender --output-dir dist
+
+    - name: Upload the extension zips
+      uses: actions/upload-artifact@v4
+      with:
+        name: extension-zips
+        path: dist/*.zip
+        if-no-files-found: error

.gitignore

@@ -7,3 +7,4 @@ tests/**/out
 blender/
 blender-*.tar.xz
 .coverage.*
+*.serialized