#20 Fix conda test issues

Chaste · Nov 3, 2024 · 254430a · 254430a
1 parent 2e8484f
commit 254430a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/test-cells.yml b/.github/workflows/test-cells.yml
@@ -37,7 +37,6 @@ jobs:
         with:
           auto-update-conda: true
           use-mamba: true
-          miniforge-variant: Mambaforge
           miniforge-version: latest
           python-version: ${{ matrix.python-version }}
           activate-environment: test_cells
@@ -80,7 +79,7 @@ jobs:
         working-directory: examples/cells
 
       - name: Build
-        run: pip install --user --no-cache-dir -v .
+        run: python -m pip install -v .
         working-directory: examples/cells
 
       - name: Test

diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
-![build](https://github.com/Chaste/cppwg/actions/workflows/build-and-test.yml/badge.svg)
+![shapes-example](https://github.com/Chaste/cppwg/actions/workflows/test-shapes.yml/badge.svg)
+![cells-example](https://github.com/Chaste/cppwg/actions/workflows/test-cells.yml/badge.svg)
 
 # cppwg
 

diff --git a/examples/cells/CMakeLists.txt b/examples/cells/CMakeLists.txt
@@ -10,12 +10,13 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
 
 # Find VTK
-find_package(VTK REQUIRED COMPONENTS
-    vtkCommonCore
-    vtkRenderingCore
-    vtkRenderingOpenGL2
-    vtkWrappingPythonCore
-)
+find_package(VTK COMPONENTS CommonCore QUIET)
+    if(VTK_FOUND)
+        find_package(VTK REQUIRED COMPONENTS CommonCore RenderingCore RenderingOpenGL2 WrappingPythonCore)
+    else()
+        find_package(VTK REQUIRED COMPONENTS vtkCommonCore vtkRenderingCore vtkRenderingOpenGL2 vtkWrappingPythonCore)
+    endif()
+endforeach()
 
 # Find PETSc
 find_package(PETSc REQUIRED)
@@ -29,9 +30,10 @@ find_package(MPI REQUIRED COMPONENTS CXX)
 # Fetch pybind11
 include(FetchContent)
 FetchContent_Declare(
-  pybind11
-  URL https://github.com/pybind/pybind11/archive/refs/tags/v2.10.4.tar.gz
-  URL_HASH SHA256=832e2f309c57da9c1e6d4542dedd34b24e4192ecb4d62f6f4866a737454c9970
+    pybind11
+    GIT_REPOSITORY https://github.com/pybind/pybind11
+    GIT_TAG v2.10.4
+    GIT_SHALLOW 1
 )
 FetchContent_MakeAvailable(pybind11)