DNM: Complete libxcb deps

glue-viz · Aug 9, 2022 · 06eeb62 · 06eeb62
1 parent 4b43b3d
commit 06eeb62
Showing 1 changed file with 6 additions and 16 deletions.
diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml
@@ -19,21 +19,16 @@ jobs:
         - linux: codestyle
 
   tests:
-    needs: initial_checks
+    needs: publish
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
     with:
       coverage: codecov
       display: true
       # The Linux PyQt 5.15 installation requires apt-getting its xcb deps and headless X11 display
       libraries: |
         apt:
+          - '^libxcb.*-dev'
           - libxkbcommon-x11-dev
-          - libxcb-icccm4-dev
-          - libxcb-image0-dev
-          - libxcb-keysyms1-dev
-          - libxcb-randr0-dev
-          - libxcb-render-util0-dev
-          - libxcb-xinerama0-dev
         brew:
           - enchant
 
@@ -76,21 +71,16 @@ jobs:
           coverage: false
 
   allowed_failures:
-    needs: initial_checks
+    needs: publish
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
     with:
       coverage: codecov
       display: true
       # The Linux PyQt 5.15 installation requires apt-getting its xcb deps and headless X11 display
       libraries: |
         apt:
+          - '^libxcb.*-dev'
           - libxkbcommon-x11-dev
-          - libxcb-icccm4-dev
-          - libxcb-image0-dev
-          - libxcb-keysyms1-dev
-          - libxcb-randr0-dev
-          - libxcb-render-util0-dev
-          - libxcb-xinerama0-dev
         brew:
           - enchant
       envs: |
@@ -101,11 +91,11 @@ jobs:
         - windows: py39-test-pyside515-all
 
   publish:
-    needs: tests
+    needs: initial_checks
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v1
     with:
       # Setup PyQt5 deps and headless X server as per pyvista/setup-headless-display-action@v1
-      libraries: 'libxkbcommon-x11-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-xinerama0-dev libgl1-mesa-glx xvfb'
+      libraries: '^libxcb.*-dev libxkbcommon-x11-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-xinerama0-dev libgl1-mesa-glx xvfb'
       test_extras: 'test,qt'
       test_command: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & sleep 3; DISPLAY=:99.0 pytest --pyargs glue
     secrets: