Update raja suite and vtk for github action images

GEOS-DEV · Aug 29, 2024 · ced4677 · ced4677
1 parent c2d6d69
commit ced4677
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 54 deletions.
diff --git a/docker/rocky-spack.yaml b/docker/rocky-spack.yaml
@@ -62,21 +62,21 @@ spack:
     hypre:
       require: "@git.06da35b1a4b1066a093bc0c6c48aee12bee74cd4"
 
-    # v2024.0.2.2
+    # v2024.07.0
     chai:
-      require: "@git.5ba0944d862513f600432c34b009824875df27e5=develop"
+      require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop"
 
-    # v2024.02.1
+    # v2024.07.0
     umpire:
-      require: "@git.3058d562fc707650e904f9321b1ee9bcebad3ae2=develop"
+      require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop"
 
-    # v2024.02.2
+    # v2024.07.0
     raja:
-      require: "@git.593f756b14ac57ded33ee61d8d2292d4beb840e6=develop"
+      require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop"
 
-    # v2024.02.1
+    # v2024.07.0
     camp:
-      require: "@git.79c320fa09db987923b56884afdc9f82f4b70fc4=main"
+      require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
 
     # v0.9.2
     conduit:

diff --git a/docker/spack.yaml b/docker/spack.yaml
@@ -133,21 +133,21 @@ spack:
     hypre:
       require: "@git.06da35b1a4b1066a093bc0c6c48aee12bee74cd4"
 
-    # v2024.0.2.2
+    # v2024.07.0
     chai:
-      require: "@git.5ba0944d862513f600432c34b009824875df27e5=develop"
+      require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop"
 
-    # v2024.02.1
+    # v2024.07.0
     umpire:
-      require: "@git.3058d562fc707650e904f9321b1ee9bcebad3ae2=develop"
+      require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop"
 
-    # v2024.02.2
+    # v2024.07.0
     raja:
-      require: "@git.593f756b14ac57ded33ee61d8d2292d4beb840e6=develop"
+      require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop"
 
-    # v2024.02.1
+    # v2024.07.0
     camp:
-      require: "@git.79c320fa09db987923b56884afdc9f82f4b70fc4=main"
+      require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
 
     # v0.9.2
     conduit:

diff --git a/docker/stanford-spack.yaml b/docker/stanford-spack.yaml
@@ -48,21 +48,21 @@ spack:
     hypre:
       require: "@git.06da35b1a4b1066a093bc0c6c48aee12bee74cd4"
 
-    # v2024.0.2.2
+    # v2024.07.0
     chai:
-      require: "@git.5ba0944d862513f600432c34b009824875df27e5=develop"
+      require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop"
 
-    # v2024.02.1
+    # v2024.07.0
     umpire:
-      require: "@git.3058d562fc707650e904f9321b1ee9bcebad3ae2=develop"
+      require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop"
 
-    # v2024.02.2
+    # v2024.07.0
     raja:
-      require: "@git.593f756b14ac57ded33ee61d8d2292d4beb840e6=develop"
+      require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop"
 
-    # v2024.02.1
+    # v2024.07.0
     camp:
-      require: "@git.79c320fa09db987923b56884afdc9f82f4b70fc4=main"
+      require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
 
     # v0.9.2
     conduit:

diff --git a/docker/total-spack.yaml b/docker/total-spack.yaml
@@ -64,21 +64,21 @@ spack:
     hypre:
       require: "@git.06da35b1a4b1066a093bc0c6c48aee12bee74cd4"
 
-    # v2024.0.2.2
+    # v2024.07.0
     chai:
-      require: "@git.5ba0944d862513f600432c34b009824875df27e5=develop"
+      require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop"
 
-    # v2024.02.1
+    # v2024.07.0
     umpire:
-      require: "@git.3058d562fc707650e904f9321b1ee9bcebad3ae2=develop"
+      require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop"
 
-    # v2024.02.2
+    # v2024.07.0
     raja:
-      require: "@git.593f756b14ac57ded33ee61d8d2292d4beb840e6=develop"
+      require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop"
 
-    # v2024.02.1
+    # v2024.07.0
     camp:
-      require: "@git.79c320fa09db987923b56884afdc9f82f4b70fc4=main"
+      require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main"
 
     # v0.9.2
     conduit:

diff --git a/scripts/spack_packages/packages/geosx/package.py b/scripts/spack_packages/packages/geosx/package.py
@@ -132,7 +132,7 @@ class Geosx(CMakePackage, CudaPackage):
     depends_on('[email protected]')
 
     depends_on('[email protected] cxxstd=14')
-    depends_on('vtk@9.2.6', when='+vtk')
+    depends_on('vtk@9.3.1', when='+vtk')
 
     #
     # Math

diff --git a/scripts/spack_packages/packages/vtk/package.py b/scripts/spack_packages/packages/vtk/package.py
@@ -20,6 +20,7 @@ class Vtk(CMakePackage):
 
     maintainers = ['chuckatkins', 'danlipsa']
 
+    version("9.3.1", sha256="8354ec084ea0d2dc3d23dbe4243823c4bfc270382d0ce8d658939fd50061cab8")
     version("9.2.6", sha256="06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12")
     version('9.1.0', sha256='8fed42f4f8f1eb8083107b68eaa9ad71da07110161a3116ad807f43e5ca5ce96')
     version('9.0.3', sha256='bc3eb9625b2b8dbfecb6052a2ab091fc91405de4333b0ec68f3323815154ed8a')
@@ -38,8 +39,6 @@ class Vtk(CMakePackage):
     variant('python', default=False, description='Enable Python support')
     variant('mpi', default=True, description='Enable MPI support')
 
-    patch('vtkXMLReader-fpe.patch', when='@9.1.0:')
-
     extends('python', when='+python')
 
     # Acceptable python versions depend on vtk version

diff --git a/scripts/spack_packages/packages/vtk/vtkXMLReader-fpe.patch b/scripts/spack_packages/packages/vtk/vtkXMLReader-fpe.patch