Merge branch 'devel' into do/release_4_4_0

Author: dopitz

.github/workflows/integrate.yml

@@ -412,9 +412,6 @@ jobs:
         cmake --build build --config Release --target test_integration
 
 
-
-
-
   integrate-static-linux-ICX:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
@@ -537,7 +534,6 @@ jobs:
     with:
       image: embree/ubuntu:24.04
       runs-on: '[ "Linux", "docker", "build" ]'
-      project: embree
       dpcpp-version: intel/2025.0
       artifact-out: integrate-sycl-linux-ICX
       artifact-path: ./build/*.tar.gz
@@ -554,7 +550,6 @@ jobs:
       image: embree/ubuntu:24.04
       options: --device=/dev/dri:/dev/dri
       runs-on: '[ "Linux", "docker", "dg2" ]'
-      project: embree
       env-from-files: ./.github/workflows/gfx-ubuntu24-public.env
       dpcpp-version: intel/2025.0
       artifact-in: integrate-sycl-linux-ICX
@@ -569,29 +564,27 @@ jobs:
     with:
       image: embree/ubuntu:24.04
       runs-on: '[ "Linux", "docker", "build" ]'
-      project: embree
       env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env
-      artifact-out: linux-DG2-JIT-PUBLIC-build
+      artifact-out: integrate-sycl-linux-DPCPP
       artifact-path: ./build/*.tar.gz
       cmd: |
         module load cmake/3.25.3
         cmake --preset integrate-sycl-linux-dpcpp -DCMAKE_BUILD_TYPE=Release
         cmake --build build --config Release --target build
 
-  istegrate-sycl-linux-DPCPP-test:
+  integrate-sycl-linux-DPCPP-test:
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     needs: [ "integrate-sycl-linux-DPCPP" ]
     with:
       image: embree/ubuntu:24.04
       options: --device=/dev/dri:/dev/dri
       runs-on: '[ "Linux", "docker", "dg2" ]'
-      project: embree
       env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-ubuntu24-public.env
       artifact-in: integrate-sycl-linux-DPCPP
       cmd: |
         module load cmake/3.25.3
-        cmake --preset integrate-sycl-linux-dpcpp -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-icx
+        cmake --preset integrate-sycl-linux-dpcpp -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-clang
         cmake --build build --config Release --target test_integration
         
 
@@ -637,8 +630,6 @@ jobs:
       
 
 
-
-
 #  TODO: cant find tbb/tbb.h ???
   integrate-macos-CLANG:
     secrets: inherit

.github/workflows/release.yml

@@ -262,22 +262,3 @@ jobs:
       artifact-in-macos: release-macosx-arm
       path: "build/*.zip"
       artifact-out-name: "antivirus-scan-arm"
-
-#####################################################################
-# Testing package
-#####################################################################
-  test-package:
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
-    needs: [release-linux]
-    with:
-      image: embree/ubuntu:22.04
-      runs-on: '[ "Linux", "docker", "dg2" ]'
-      project: embree
-      env-from-files: ./.github/workflows/gfx-ubuntu22-public.env
-      artifact-in: release-linux
-      artifact-out: release-testing-PACKAGE-ZIP
-      artifact-path: ./build/*.tar.gz
-      cmd: |
-        rm build/embree-4.4.0.x86_64.linux.tar.gz
-        mv build/embree-4.4.0.x86_64.linux-testing.tar.gz build/embree-4.4.0-testing.tar.gz

.gitlab-ci.yml

@@ -86,6 +86,14 @@
       "name": "package-windows",
       "hidden": true,
       "inherits": ["package", "windows"],
+      "cacheVariables": {
+        "CMAKE_INSTALL_DATAROOTDIR": ""
+      }
+    },
+    {
+      "name": "package-windows-signed",
+      "hidden": true,
+      "inherits": ["package", "windows"],
       "cacheVariables": {
         "CMAKE_INSTALL_DATAROOTDIR": "",
         "EMBREE_SIGN_FILE": "$env{SIGN_FILE_WINDOWS}"
@@ -96,8 +104,7 @@
       "hidden": true,
       "inherits": ["package-static", "windows"],
       "cacheVariables": {
-        "CMAKE_INSTALL_DATAROOTDIR": "",
-        "EMBREE_SIGN_FILE": "$env{SIGN_FILE_WINDOWS}"
+        "CMAKE_INSTALL_DATAROOTDIR": ""
       }
     }
   ]

scripts/cmake-presets/package.json

@@ -14,7 +14,7 @@
   "configurePresets": [
     {
       "name": "release-windows",
-      "inherits": ["package-windows", "env", "dpcpp-windows", "ispc1_23_0", "tbb2021_11_0"],
+      "inherits": ["package-windows-signed", "env", "dpcpp-windows", "ispc1_23_0", "tbb2021_11_0"],
       "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
@@ -53,7 +53,7 @@
 
     {
       "name": "release-windows-sycl",
-      "inherits": ["package-windows", "env", "dpcpp-windows", "ispc1_23_0", "tbb2021_11_0"],
+      "inherits": ["package-windows-signed", "env", "dpcpp-windows", "ispc1_23_0", "tbb2021_11_0"],
       "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",