From 43fa72caf19d00c7b054f2024ea33d8b2325bca0 Mon Sep 17 00:00:00 2001 From: alessandrofelder Date: Mon, 13 Jan 2025 10:50:00 +0000 Subject: [PATCH 1/2] bump headless display action 2->3 --- .github/workflows/test_and_deploy.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 6478383..b84deca 100644 --- 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 }} From 2d3cb3730c61fbb99fb8abedc2564b491631f05f Mon Sep 17 00:00:00 2001 From: Alessandro Felder Date: Mon, 13 Jan 2025 11:08:36 +0000 Subject: [PATCH 2/2] fix botched cherry-pick --- .github/workflows/test_and_deploy.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index b84deca..061792d 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -55,18 +55,10 @@ 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) + # Run tests - uses: neuroinformatics-unit/actions/test@v2 with: python-version: ${{ matrix.python-version }}