Add VTK9 to portabilities

.github/workflows/boost.yml

@@ -2,26 +2,36 @@ name: boost
 
 on:
   workflow_dispatch:
+    inputs:
+      boost_ver:
+        description: 'Boost version'
+        required: true
+        type: string
+        default: '1.74.0'
+
+      os:
+        description: 'OS'
+        required: true
+        type: choice
+        options:
+          - 'ubuntu-20.04'
+          - 'ubuntu-22.04'
+        default: 'ubuntu-22.04'
 
 jobs:
   setup:
-    name: build and cache boost versions
-
-    strategy:
-      matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
-      fail-fast: false
-
-    runs-on: ${{ matrix.os }}
+    name: build and cache boost
+
+    runs-on: ${{ github.event.inputs.os }}
 
     steps:
       - name: checkout
         uses: actions/checkout@v3
 
-      - name: setup defaults
+      - name: setup os
         uses: ./.github/actions/setup-defaults
 
-      - name: build and cache boost 1.74.0
+      - name: build and cache
         uses: ./.github/actions/setup-boost
         with:
-          boost_ver: 1.74.0
+          boost_ver: ${{ github.event.inputs.boost_ver }}

.github/workflows/docker-portability-03.yml

@@ -19,7 +19,7 @@ jobs:
               XERCESC=3.2.3
               SUNDIALS=4.1.0
               BOOST=1.71.0
-              VTK=7.1.1
+              VTK=9.0.3
               PETSC=3.14.6
               HDF5=1.10.6
 

.github/workflows/docker-portability-05.yml

@@ -19,7 +19,7 @@ jobs:
               XERCESC=3.2.4
               SUNDIALS=6.0.0
               BOOST=1.74.0
-              VTK=8.2.0
+              VTK=9.1.0
               PETSC=3.15.5
               HDF5=1.10.8
 

.github/workflows/petsc_hdf5.yml

@@ -2,28 +2,53 @@ name: petsc_hdf5
 
 on:
   workflow_dispatch:
+    inputs:
+      petsc_ver:
+        description: 'PETSc version'
+        required: true
+        type: string
+        default: '3.15.5'
+
+      petsc_arch:
+        description: 'PETSc arch'
+        required: true
+        type: choice
+        options:
+          - 'linux-gnu'
+          - 'linux-gnu-opt'
+        default: 'linux-gnu'
+
+      hdf5_ver:
+        description: 'HDF5 version'
+        required: true
+        type: string
+        default: '1.10.8'
+
+      os:
+        description: 'OS'
+        required: true
+        type: choice
+        options:
+          - 'ubuntu-20.04'
+          - 'ubuntu-22.04'
+        default: 'ubuntu-22.04'
 
 jobs:
   setup:
-    name: build and cache petsc_hdf5 versions
-
-    strategy:
-      matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
-      fail-fast: false
+    name: build and cache petsc_hdf5
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ github.event.inputs.os }}
 
     steps:
       - name: checkout
         uses: actions/checkout@v3
 
-      - name: setup defaults
+      - name: setup os
         uses: ./.github/actions/setup-defaults
 
-      - name: build and cache petsc 3.15.5 / hdf5 1.10.8 / linux-gnu
+      - name: build and cache
         uses: ./.github/actions/setup-petsc_hdf5
         with:
-          petsc_ver: 3.15.5
-          hdf5_ver: 1.10.8
-          petsc_arch: linux-gnu
+          petsc_ver: ${{ github.event.inputs.petsc_ver }}
+          petsc_arch: ${{ github.event.inputs.petsc_arch }}
+          hdf5_ver: ${{ github.event.inputs.hdf5_ver }}

.github/workflows/sundials.yml

@@ -2,26 +2,36 @@ name: sundials
 
 on:
   workflow_dispatch:
+    inputs:
+      sundials_ver:
+        description: 'SUNDIALS version'
+        required: true
+        type: string
+        default: '5.8.0'
+
+      os:
+        description: 'OS'
+        required: true
+        type: choice
+        options:
+          - 'ubuntu-20.04'
+          - 'ubuntu-22.04'
+        default: 'ubuntu-22.04'
 
 jobs:
   setup:
-    name: build and cache sundials versions
-
-    strategy:
-      matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
-      fail-fast: false
+    name: build and cache sundials
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ github.event.inputs.os }}
 
     steps:
       - name: checkout
         uses: actions/checkout@v3
 
-      - name: setup defaults
+      - name: setup os
         uses: ./.github/actions/setup-defaults
 
-      - name: build and cache sundials 5.8.0
+      - name: build and cache
         uses: ./.github/actions/setup-sundials
         with:
-          sundials_ver: 5.8.0
+          sundials_ver: ${{ github.event.inputs.sundials_ver }}

.github/workflows/vtk.yml

@@ -2,26 +2,36 @@ name: vtk
 
 on:
   workflow_dispatch:
+    inputs:
+      vtk_ver:
+        description: 'VTK version'
+        required: true
+        type: string
+        default: '9.2.6'
+
+      os:
+        description: 'OS'
+        required: true
+        type: choice
+        options:
+          - 'ubuntu-20.04'
+          - 'ubuntu-22.04'
+        default: 'ubuntu-22.04'
 
 jobs:
   setup:
-    name: build and cache vtk versions
-
-    strategy:
-      matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
-      fail-fast: false
+    name: build and cache vtk
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ github.event.inputs.os }}
 
     steps:
       - name: checkout
         uses: actions/checkout@v3
 
-      - name: setup defaults
+      - name: setup os
         uses: ./.github/actions/setup-defaults
 
-      - name: build and cache vtk 7.1.1
+      - name: build and cache
         uses: ./.github/actions/setup-vtk
         with:
-          vtk_ver: 7.1.1
+          vtk_ver: ${{ github.event.inputs.vtk_ver }}

.github/workflows/xercesc.yml

@@ -2,26 +2,36 @@ name: xercesc
 
 on:
   workflow_dispatch:
+    inputs:
+      xercesc_ver:
+        description: 'XercesC version'
+        required: true
+        type: string
+        default: '3.2.4'
+
+      os:
+        description: 'OS'
+        required: true
+        type: choice
+        options:
+          - 'ubuntu-20.04'
+          - 'ubuntu-22.04'
+        default: 'ubuntu-22.04'
 
 jobs:
   setup:
-    name: build and cache xercesc versions
-
-    strategy:
-      matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
-      fail-fast: false
+    name: build and cache xercesc
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ github.event.inputs.os }}
 
     steps:
       - name: checkout
         uses: actions/checkout@v3
 
-      - name: setup defaults
+      - name: setup os
         uses: ./.github/actions/setup-defaults
 
-      - name: build and cache xercesc 3.2.4
+      - name: build and cache
         uses: ./.github/actions/setup-xercesc
         with:
-          xercesc_ver: 3.2.4
+          xercesc_ver: ${{ github.event.inputs.xercesc_ver }}

.github/workflows/xsd.yml

@@ -2,26 +2,36 @@ name: xsd
 
 on:
   workflow_dispatch:
+    inputs:
+      xsd_ver:
+        description: 'XSD version'
+        required: true
+        type: string
+        default: '4.0.0'
+
+      os:
+        description: 'OS'
+        required: true
+        type: choice
+        options:
+          - 'ubuntu-20.04'
+          - 'ubuntu-22.04'
+        default: 'ubuntu-22.04'
 
 jobs:
   setup:
-    name: install and cache xsd versions
-
-    strategy:
-      matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
-      fail-fast: false
+    name: install and cache xsd
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ github.event.inputs.os }}
 
     steps:
       - name: checkout
         uses: actions/checkout@v3
 
-      - name: setup defaults
+      - name: setup os
         uses: ./.github/actions/setup-defaults
 
-      - name: install and cache xsd 4.0.0
+      - name: install and cache
         uses: ./.github/actions/setup-xsd
         with:
-          xsd_ver: 4.0.0
+          xsd_ver: ${{ github.event.inputs.xsd_ver }}

scripts/install_vtk.sh

@@ -62,22 +62,28 @@ else  # VTK > 6.0.x
     tar -xzf v${version}.tar.gz -C ${src_dir} --strip-components=1
 fi
 
-# VTK 6 patches: https://sources.debian.org/patches/vtk6/6.3.0%2Bdfsg2-8.1/
-if [[ ${major} -eq 6 ]]; then  # VTK == 6.x.x
+# VTK 6.3.x patches: https://sources.debian.org/patches/vtk6/6.3.0%2Bdfsg2-8.1/
+if [[ ${major} -eq 6 && ${minor} -eq 3 ]]; then  # VTK == 6.3.x
     cd ${src_dir}
-    patch -t -p1 < ${script_dir}/patches/vtk6.patch
+    patch -t -p1 < ${script_dir}/patches/vtk6.3.patch
 fi
 
-# VTK 7 patches: https://sources.debian.org/patches/vtk7/7.1.1%2Bdfsg2-10.2/
-if [[ ${major} -eq 7 ]]; then  # VTK == 7.x.x
+# VTK 7.1.x patches: https://sources.debian.org/patches/vtk7/7.1.1%2Bdfsg2-10.2/
+if [[ ${major} -eq 7 && ${minor} -eq 1 ]]; then  # VTK == 7.1.x
     cd ${src_dir}
-    patch -t -p1 < ${script_dir}/patches/vtk7.patch
+    patch -t -p1 < ${script_dir}/patches/vtk7.1.patch
 fi
 
-# VTK 8 patches: https://sources.debian.org/patches/vtk7/7.1.1%2Bdfsg2-10.2/
-if [[ ${major} -eq 8 ]]; then  # VTK == 8.x.x
+# VTK 8.2.x patches: https://sources.debian.org/patches/vtk7/7.1.1%2Bdfsg2-10.2/
+if [[ ${major} -eq 8 && ${minor} -eq 2 ]]; then  # VTK == 8.2.x
     cd ${src_dir}
-    patch -t -p1 < ${script_dir}/patches/vtk8.patch
+    patch -t -p1 < ${script_dir}/patches/vtk8.2.patch
+fi
+
+# VTK 9.0.x patches: https://sources.debian.org/patches/vtk9/9.0.1%2Bdfsg1-8/
+if [[ ${major} -eq 9 && ${minor} -eq 0 ]]; then  # VTK == 9.0.x
+    cd ${src_dir}
+    patch -t -p1 < ${script_dir}/patches/vtk9.0-fix-limits.patch
 fi
 
 # Build and install

scripts/patches/vtk6_combinediff.sh → scripts/patches/vtk6.3_patches.sh

@@ -40,5 +40,5 @@ combinediff tmp1.patch 120_fix_ftbfs_qtpainter.patch > tmp2.patch
 combinediff tmp2.patch 3edc0de2b04ae1e100c229e592d6b9fa94f2915a.patch > tmp1.patch 
 combinediff tmp1.patch 581d9eb874b2b80a3fb21c739a96fa6f955ffb5e.patch > tmp2.patch 
 combinediff tmp2.patch new-freetype.patch > tmp1.patch
-combinediff tmp1.patch vtk6-gcc11-support.patch > vtk6.patch
+combinediff tmp1.patch vtk6-gcc11-support.patch > vtk6.3.patch
 rm tmp1.patch tmp2.patch

scripts/patches/vtk7_combinediff.sh → scripts/patches/vtk7.1_patches.sh

@@ -48,6 +48,6 @@ combinediff tmp1.patch mysq8_my_bool.patch > tmp2.patch
 combinediff tmp2.patch 3edc0de2b04ae1e100c229e592d6b9fa94f2915a.patch > tmp1.patch 
 combinediff tmp1.patch 581d9eb874b2b80a3fb21c739a96fa6f955ffb5e.patch > tmp2.patch 
 combinediff tmp2.patch gcc-11.patch > tmp1.patch 
-combinediff tmp1.patch ffmpeg-5.patch > vtk7.patch 
+combinediff tmp1.patch ffmpeg-5.patch > vtk7.1.patch 
 
 rm tmp1.patch tmp2.patch

scripts/patches/vtk8_combinediff.sh → scripts/patches/vtk8.2_patches.sh

@@ -33,6 +33,6 @@ combinediff tmp1.patch 115_support-gcc10.patch > tmp2.patch
 combinediff tmp2.patch mysq8_my_bool.patch > tmp1.patch 
 combinediff tmp1.patch 3edc0de2b04ae1e100c229e592d6b9fa94f2915a.patch > tmp2.patch 
 combinediff tmp2.patch 581d9eb874b2b80a3fb21c739a96fa6f955ffb5e.patch > tmp1.patch 
-combinediff tmp1.patch vtk8-gcc-11-exodus.patch > vtk8.patch
+combinediff tmp1.patch vtk8-gcc-11-exodus.patch > vtk8.2.patch
 
 rm tmp1.patch tmp2.patch