Merge pull request #654 from LuxCoreRender/for_v2.10

Merge v2.10 into Master

Author: howetuft

.ccache/dummy.txt

@@ -123,21 +123,9 @@ jobs:
                 core.exportVariable(key, value);
             }
 
-      # TODO
-      ## Update apt: needed to install ccache
-      #- name: Update apt (Linux)
-        #if: runner.os == 'Linux'
-        #shell: bash
-        #run: |
-          #sudo apt-get update -y
-
       - uses: actions/setup-python@v5
         with:
           python-version: 3.13
-      - name: Install GH CLI
-        uses: dev-hanz-ops/install-gh-cli-action@v0.2.1
-        with:
-          gh-cli-version: 2.67.0
 
       # Update apt: needed to install ccache-action
       - name: Update apt (Linux)
@@ -151,8 +139,7 @@ jobs:
         with:
           create-symlink: false
           variant: ${{ env.cache-variant }}
-          key: samples-${{ matrix.os }}-
-          restore-keys: samples-${{ matrix.os }}-
+          key: samples-${{ matrix.os }}
           max-size: 5G
           verbose: 1
 
@@ -180,45 +167,30 @@ jobs:
             core.exportVariable('MACOSX_DEPLOYMENT_TARGET', target);
             core.exportVariable('PKG_ARCH', arch);
 
-      - name: Export version
-        shell: python
-        run: |
-          import json
-          if (input_version := "${{ inputs.release-version }}"):
-            result = input_version
-          else:
-            with open("luxcore.json") as in_file:
-              default_version = json.load(in_file)["DefaultVersion"]
-            result = ".".join(default_version[i] for i in ("major", "minor", "patch"))
-            if (prerelease := default_version["prerelease"]):
-              result = f"{result}-{prerelease}"
-
-          print(f"Version: {result}")
-
-          with open("SKVERSION", "w+") as out_file:
-            out_file.write(result)
-
-      - name: Output version
-        id: output-version
-        shell: bash
+      - name: Build (Windows)
+        if: runner.os == 'Windows'
+        shell: cmd
+        env:
+          CONAN_HOME: ${{ github.workspace }}\.conan2
         run: |
-          _version=$(cat SKVERSION)
-          echo "version=${_version}" >> "$GITHUB_OUTPUT"
+          pip install conan && make deps && make luxcore && make luxcoreui && make luxcoreconsole
 
-      - name: Build (Windows/MacOS)
-        if: ${{ ! runner.os == 'Linux' }}
-        shell: bash -el {0}
+      - name: Build (MacOS)
+        if: runner.os == 'macOS'
+        shell: bash
         run: |
           pip install conan
           make deps
-          make
-          make package
+          make luxcore
+          make luxcoreui
+          make luxcoreconsole
 
       # Build for Linux is containerized in manylinux_2_28_x86_64
       - name: Build (Linux)
         if: runner.os == 'Linux'
         shell: bash
         env:
+          CONTAINER: manylinux
           # COMMAND contains code that'll be executed in container
           COMMAND: |
             # Set Python
@@ -228,9 +200,6 @@ jobs:
             python -m pip install conan
 
             # Install toolchain (gcc, ccache...)
-            #dnf install -y epel-release
-            #dnf install -y almalinux-release-devel
-            #dnf install -y perl-IPC-Cmd perl-Digest-SHA
             CC=/opt/rh/gcc-toolset-14/root/usr/bin/gcc
             CXX=/opt/rh/gcc-toolset-14/root/usr/bin/g++
             export CMAKE_C_COMPILER_LAUNCHER=ccache
@@ -262,9 +231,9 @@ jobs:
 
             # Build
             make deps
+            make luxcore
             make luxcoreui
             make luxcoreconsole
-            make package
 
             # Re-inspect ccache
             echo "ccache results:"
@@ -273,11 +242,10 @@ jobs:
         # run contains code that'll be executed on host side
         run: |
           # Clean (remove container if it exists)
-          CONTAINER=manylinux
           CONTAINER_LIST=$(docker container ps -a)
-          if [[ ${CONTAINER_LIST} == *${CONTAINER}* ]]; then
-            echo "Removing existing container '${CONTAINER}'"
-            docker rm --force ${CONTAINER}
+          if [[ ${CONTAINER_LIST} == *${{ env.CONTAINER }}* ]]; then
+            echo "Removing existing container '${{ env.CONTAINER }}'"
+            docker rm --force ${{ env.CONTAINER }}
           fi
 
           # Start
@@ -286,44 +254,59 @@ jobs:
           echo ""
           docker create \
             -t \
-            --name ${CONTAINER} \
+            --name ${{ env.CONTAINER }} \
             quay.io/pypa/manylinux_2_28_x86_64
-          docker start ${CONTAINER}
-          docker exec ${CONTAINER} env
+          docker start ${{ env.CONTAINER }}
+          docker exec ${{ env.CONTAINER }} env
 
           # Copy source tree
-          docker exec ${CONTAINER} sh -c "echo Copying source tree"
-          docker cp ${{ github.workspace }} ${CONTAINER}:/project
+          docker exec ${{ env.CONTAINER }} sh -c "echo Copying source tree"
+          docker cp ${{ github.workspace }} ${{ env.CONTAINER }}:/project
 
           # Copy ccache
           echo "Copying ${{ env.CCACHE_DIR }} to container"
-          docker cp ${{ env.CCACHE_DIR }}/. ${CONTAINER}:/root/.ccache
+          docker cp ${{ env.CCACHE_DIR }}/. ${{ env.CONTAINER }}:/root/.ccache
 
           # Execute COMMAND in container
-          docker exec --workdir=/project ${CONTAINER} sh -c '${{ env.COMMAND }}'
+          docker exec --workdir=/project ${{ env.CONTAINER }} sh -c '${{ env.COMMAND }}'
 
           # Copy ccache back
-          docker cp ${CONTAINER}:/root/.ccache/. ${{ env.CCACHE_DIR }}
+          docker cp ${{ env.CONTAINER }}:/root/.ccache/. ${{ env.CCACHE_DIR }}
 
           # Get artifact
           mkdir -p ${{ github.workspace }}/out/build
-          docker cp ${CONTAINER}:/project/out ${{ github.workspace }}
+          docker cp ${{ env.CONTAINER }}:/project/out ${{ github.workspace }}
 
           # Stop container
-          docker stop ${CONTAINER}
+          docker stop ${{ env.CONTAINER }}
+
+          # Remove superfluous files (hack)
+          rm ${{ github.workspace }}/out/install/Release/lib/libnvrtc*.alt.*
 
       #- name: Setup tmate session (debug)
         #if: ${{ failure() }}
         #uses: mxschmitt/action-tmate@v3
 
+      - name: Install 7zip (act)
+        if: ${{ env.ACT }}
+        shell: bash
+        run: |
+          apt install -y p7zip-full
+
+      - name: Bundle artifacts
+        run: |
+          7z a LuxCore.7z ${{ github.workspace }}/out/install/Release
+
       # Upload artifacts
       - uses: actions/upload-artifact@v4
         id: upload
         with:
-          path: ${{ github.workspace }}/out/build/LuxCore-*.zip
+          name: LuxCore-${{ runner.os }}-${{ runner.arch }}
+          path: ${{ github.workspace }}/LuxCore.7z
+          #path: ${{ github.workspace }}/out/install/Release
 
   attest-samples:
-    needs: [build-wheels]
+    needs: [build-samples]
     runs-on: ubuntu-latest
     permissions:
       attestations: write

.github/FUNDING.yml

@@ -1,15 +1,21 @@
-# SPDX-FileCopyrightText: 2024 Howetuft
+# SPDX-FileCopyrightText: 2024-2025 Authors (see AUTHORS.txt)
 #
 # SPDX-License-Identifier: Apache-2.0
 
-# This action is the 1st part of a larger toolchain. You will find the other
-# components in LuxCoreRender/LuxCoreWheels repository
-
 
 name: LuxCore Python Wheels Builder
 
 on:
   workflow_dispatch:
+      inputs:
+        build-type:
+          description: 'Build type'
+          required: true
+          default: 'Release'
+          type: choice
+          options:
+            - Release
+            - Debug
   workflow_call:
     inputs:
       repository:
@@ -25,6 +31,11 @@ on:
       version:
         description: 'The version to build - must comply to semver, or blank for default'
         type: string
+      build-type:
+        description: 'Build type'
+        required: true
+        default: 'Release'
+        type: string
     outputs:
       commit:
         description: "The commit that has been checked out"
@@ -58,7 +69,7 @@ jobs:
         #os: [macos-13]
     env:
       # Reminder: report all variables here to CIBW_ENVIRONMENT_PASS_LINUX
-      BUILD_TYPE: Release
+      BUILD_TYPE: ${{ github.event.inputs.build-type || 'Release' }}
       CXX_VERSION: 20
       GCC_VERSION: 14
       GLIBC_VERSION: 2_28
@@ -124,7 +135,7 @@ jobs:
                 'cache-variant': String.raw`ccache`,
                 'CMAKE_CXX_COMPILER_LAUNCHER': String.raw`ccache`,
                 'CMAKE_C_COMPILER_LAUNCHER': String.raw`ccache`,
-                'CCACHE_CONFIGPATH': String.raw`${workspace}/ccache.conf`,
+                'CCACHE_CONFIGPATH': String.raw`${workspace}/build-helpers/ccache.conf`,
                 'CCACHE_DIR': String.raw`${workspace}/.ccache`,
                 'CCACHE_DEBUGDIR': String.raw`${workspace}/ccache-debug`,
                 'CCACHE_LOGFILE': String.raw`${workspace}/ccache.log`
@@ -168,7 +179,7 @@ jobs:
           echo "AR=${_T}/usr/bin/ar" >> $GITHUB_ENV
           echo "RANLIB=${_T}/usr/bin/ranlib" >> $GITHUB_ENV
 
-      - name: Set MacOS deployment target
+      - name: Set MacOS deployment target and other set-ups
         if: runner.os == 'macOS'
         uses: actions/github-script@v7
         with:
@@ -188,6 +199,18 @@ jobs:
             core.exportVariable('MACOSX_DEPLOYMENT_TARGET', target);
             core.exportVariable('PKG_ARCH', arch);
 
+      - name: Prepare MacOS
+        if: runner.os == 'macOS'
+        shell: bash
+        run: |
+            _T=$(brew --prefix llvm@15)
+            echo "CXX=${_T}/bin/clang++" >> $GITHUB_ENV
+            echo "CC=${_T}/bin/clang" >> $GITHUB_ENV
+            #echo "AR=${_T}/bin/ar" >> $GITHUB_ENV
+            #echo "RANLIB=${_T}/bin/ranlib" >> $GITHUB_ENV
+            echo "LDFLAGS=-fuse-ld=$_T/bin/ld64.lld" >> $GITHUB_ENV
+
+
       # TODO: The following block is an ugly hack but, at the moment (2025-02-25),
       # scikit-build-core lacks a preset parameter, so this is the only way
       # I found to pass a calculated environment var to CMake build step
@@ -208,10 +231,12 @@ jobs:
         shell: python
         run: |
           import json
+          from pathlib import Path
           if (input_version := "${{ inputs.release-version }}"):
             result = input_version
           else:
-            with open("luxcore.json") as in_file:
+            build_settings_file = Path("build-helpers", "build-settings.json")
+            with open(build_settings_file) as in_file:
               default_version = json.load(in_file)["DefaultVersion"]
             result = ".".join(default_version[i] for i in ("major", "minor", "patch"))
             if (prerelease := default_version["prerelease"]):
@@ -241,9 +266,10 @@ jobs:
           CIBW_ARCHS: auto64
           CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_${{ env.GLIBC_VERSION }}_x86_64
           CIBW_ENVIRONMENT: >
-            SKBUILD_CMAKE_ARGS='--preset ${{ env.CONAN_PRESET }};-G Ninja;--log-level=VERBOSE;-DLUXCORE_VERSION=${{ steps.output-version.outputs.version }}'
+            SKBUILD_CMAKE_ARGS='--preset conan-default;--log-level=VERBOSE;-DLUXCORE_VERSION=${{ steps.output-version.outputs.version }};-G Ninja Multi-Config'
             SKBUILD_CMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}
-            LUX_GENERATOR='Ninja'
+            GH_TOKEN=${{ secrets.GITHUB_TOKEN }}
+            LUX_BUILD_TYPE=${{ env.BUILD_TYPE }}
           CIBW_ENVIRONMENT_PASS_LINUX: |
             CC
             CXX
@@ -268,14 +294,25 @@ jobs:
             dnf install -y epel-release
             dnf install -y almalinux-release-devel
             dnf install -y ccache
-            dnf install -y sudo  # for gtk3...
             dnf install -y perl-IPC-Cmd perl-Digest-SHA
 
-            # Manylinux_2_34 compatibility
+            # Install gh (via conda)
+            dnf install -y wget
+            mkdir -p miniconda3
+            wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda3/miniconda.sh
+            bash miniconda3/miniconda.sh -b -u -p miniconda3
+            rm miniconda3/miniconda.sh
+            source miniconda3/bin/activate
+            conda init --all
+            conda install gh --channel conda-forge -y
+            echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token
+
+            # Manylinux_2_34 compatibility (for future use)
             if [[ ${{ env.GLIBC_VERSION }} != 2_28 ]]; then
               dnf install -y perl-FindBin perl-lib
             fi
 
+            # Install dependencies
             pip install conan && make deps
 
           CIBW_BEFORE_ALL_MACOS: |
@@ -302,7 +339,7 @@ jobs:
               {wheel}
 
           CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: |
-            bash.exe ${{ env.WORKSPACE }}/scripts/repair_wheel_windows.sh '{wheel}' '{dest_dir}' '%VCToolsRedistDir%%Platform%' '${{ env.WORKSPACE }}'
+            bash.exe ${{ env.WORKSPACE }}/build-helpers/wheels/repair_wheel_windows.sh '{wheel}' '{dest_dir}' '%VCToolsRedistDir%%Platform%' '${{ env.WORKSPACE }}'
           CIBW_REPAIR_WHEEL_COMMAND_MACOS: |
             cp {wheel} ${{ env.WORKSPACE }}
             paths=$(find ${{ env.WORKSPACE }} -type d -wholename "*/lib" -print0 | xargs -0 realpath | tr "\n" ":")
@@ -337,9 +374,6 @@ jobs:
           path: conan-cache
           key: deps-${{ matrix.os }}-${{ matrix.python-minor}}-${{ hashFiles('**/conan-cache') }}
 
-      #- name: Setup tmate session
-        #uses: mxschmitt/action-tmate@v3
-
       #- name: Setup tmate session (debug)
         #if: ${{ failure() }}
         #uses: mxschmitt/action-tmate@v3

.github/workflows/sample-builder.yml

@@ -12,9 +12,9 @@ on:
   workflow_dispatch:
     inputs:
       release-tag:
-        description: "Tag of the release to publish"
+        description: "Version of the release to publish (major.minor.patch[-rev])"
         required: True
-        default: v0.0.1
+        default: 0.0.1
         type: string
       test:
         description: "Publish on Pypi test"
@@ -43,7 +43,7 @@ jobs:
         run: |
           # Warning: Target release must not be in 'draft' status,
           # otherwise gh release won't find it
-          gh release download ${{ inputs.release-tag}} -D tmp -R LuxCoreRender/LuxCoreWheels
+          gh release download wheels-v${{ inputs.release-tag}} -D tmp -R LuxCoreRender/LuxCore
           mkdir dist
           for d in tmp/*.zip ; do
               echo "unzip ${d}"