Merge branch 'main' into release

a-latyshev · Oct 13, 2024 · 83f4d54 · 83f4d54
2 parents 3a70827 + f2bf3fe
commit 83f4d54
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - "**"
+      - "!main"
   pull_request:
     branches:
       - "main"

diff --git a/doc/demo/demo_plasticity_mohr_coulomb.py b/doc/demo/demo_plasticity_mohr_coulomb.py
@@ -797,8 +797,7 @@ def F_ext(v):
     plotter.add_text("Displacement field", font_size=11)
     plotter.add_mesh(warped, show_edges=False, show_scalar_bar=True)
     plotter.view_xy()
-    if not pyvista.OFF_SCREEN:
-        plotter.show()
+    plotter.show()
 except ImportError:
     print("pyvista required for this plot")
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ on: @@
       push:
         branches:
           - "**"
+          - "!main"
       pull_request:
         branches:
           - "main"
@@ Expand Down @@