Merge branch 'main' into add-vispy-test

.github/workflows/local.yml

@@ -16,12 +16,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-14, macos-13, ubuntu-latest, ubuntu-20.04, windows-2019, windows-2022]
+        os: [macos-14, macos-13, ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, windows-2019, windows-2022]
         qt: [""]
         include:
-          - os: ubuntu-latest
+          - os: ubuntu-20.04
             qt: "pyqt5"
-          - os: ubuntu-latest
+          - os: ubuntu-24.04
             qt: "pyqt6"
           - os: windows-latest
             qt: "pyqt6"

action.yml

@@ -16,11 +16,21 @@ branding:
 runs:
   using: "composite"
   steps:
-    - name: Install Linux dependencies
+    - name: Update apt
       if: runner.os == 'Linux'
       shell: bash
       # TODO: Pyvista uses `xset` which is part of x11-xserver-utils, maybe a better way to check?
-      run: sudo apt update && sudo apt install libgl1-mesa-glx xvfb x11-xserver-utils -y
+      run: sudo apt update
+
+    - name: Install Linux dependencies
+      if: runner.os == 'Linux'
+      shell: bash
+      run: |
+        sudo apt-get install -y \
+          libglx-mesa0 \
+          libgl1 \
+          xvfb \
+          x11-xserver-utils
 
     - name: Install Linux Qt dependencies
       if: runner.os == 'Linux' && inputs.qt != 'false'
@@ -29,7 +39,6 @@ runs:
         sudo apt-get install -y \
           libdbus-1-3 \
           libegl1 \
-          libegl1-mesa \
           libopengl0 \
           libosmesa6 \
           libxcb-cursor0 \
@@ -64,14 +73,7 @@ runs:
         Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
         sleep 3
 
-    - name: Configure for PyVista on Linux and macOS
-      if: runner.os != 'Windows' && inputs.pyvista != 'false'
+    - name: Configure for PyVista
+      if: inputs.pyvista != 'false'
       shell: bash
       run: echo "PYVISTA_OFF_SCREEN=true" >> $GITHUB_ENV
-
-    - name: Configure for PyVista on Windows
-      if: runner.os == 'Windows' && inputs.pyvista != 'false'
-      shell: powershell
-      run: |
-        chcp 65001 #set code page to utf-8
-        echo "PYVISTA_OFF_SCREEN=true" >> $env:GITHUB_ENV