bump headless display action 2->3

brainglobe · Jan 13, 2025 · d4d15c6 · d4d15c6
1 parent 6d44afa
commit d4d15c6
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml
@@ -55,10 +55,18 @@ jobs:
         if: matrix.os == 'macos-latest'
         run: brew install hdf5
       # Setup pyqt libraries
+<<<<<<< HEAD
       - uses: tlambert03/setup-qt-libs@v1
       # Helps set up VTK with a headless display
       - uses: pyvista/setup-headless-display-action@v2
       # Run tests
+=======
+      - name: Setup qtpy libraries
+        uses: tlambert03/setup-qt-libs@v1
+      # Setup VTK with headless display
+      - uses: pyvista/setup-headless-display-action@v3
+      # Run all tests
+>>>>>>> b3e7719 (bump pyvista action version 2->3)
       - uses: neuroinformatics-unit/actions/test@v2
         with:
           python-version: ${{ matrix.python-version }}