Merge branch 'AcademySoftwareFoundation:main' into graph_genshader_graphs

Author: kwokcb

.github/workflows/main.yml

@@ -227,7 +227,7 @@ jobs:
       run: cmake --build build --target install --config Release --parallel 2
 
     - name: CMake Unit Tests
-      run: ctest -VV --output-on-failure --build-config Release
+      run: ctest --output-on-failure --build-config Release
       working-directory: build
 
     - name: Python Tests
@@ -374,12 +374,13 @@ jobs:
         path: build/**/*.perfetto-trace
         if-no-files-found: ignore
 
-    - name: Upload Log Files
+    - name: Upload Test Logs
       uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
       if: always()
       with:
-        name: Log_files_${{ matrix.name }}
+        name: TestLog_${{ matrix.name }}
         path: build/bin/**/*.txt
+        if-no-files-found: ignore
 
   javascript:
     name: JavaScript
@@ -411,17 +412,20 @@ jobs:
     - name: JavaScript CMake Build
       run: cmake --build javascript/build --target install --config Release --parallel 2
 
+    - name: Install JavaScript Dependencies
+      run: |
+        npm ci
+        npx playwright install --with-deps chromium
+      working-directory: javascript
+
     - name: JavaScript Unit Tests
       run: |
-        npm install
         npm run test
         npm run test:browser
       working-directory: javascript/MaterialXTest
 
     - name: Build Web Viewer
-      run: |
-        npm install
-        npm run build
+      run: npm run build
       working-directory: javascript/MaterialXView
 
     - name: Deploy Web Viewer

CMakeLists.txt

@@ -698,3 +698,8 @@ if(NOT SKBUILD)
             "${PROJECT_BINARY_DIR}/cmake/${CMAKE_PROJECT_NAME}Config.cmake"
             DESTINATION "${MATERIALX_GEN_CONFIG_PATH}")
 endif()
+
+# Run pip install after all install steps
+if(MATERIALX_BUILD_PYTHON AND MATERIALX_INSTALL_PYTHON AND PYTHON_EXECUTABLE AND NOT SKBUILD)
+    install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install . WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/python)")
+endif()