Merge branch 'fix-container' into 'master'

Upgraded PETSc minimum to 3.18.6.

See merge request ogs/ogs!4849

container-maker @ 4f14f402

-Subproject commit f67a7bfd0198d932a6c8fdaf66af64e8562e0558
+Subproject commit 4f14f402122cfbb3f8ce7c1b47ce79510c40962f

scripts/ci/jobs/package.yml

@@ -62,7 +62,6 @@ create cpm cache:
     - cd ext
     - wget --no-verbose --output-document tfel-rliv-${TFEL_RLIV_VERSION}.zip https://github.com/thelfer/tfel/archive/refs/heads/rliv-${TFEL_RLIV_VERSION}.zip
     - wget --no-verbose --output-document petsc-v${PETSC_VERSION}.zip https://gitlab.com/petsc/petsc/-/archive/v${PETSC_VERSION}/petsc-v${PETSC_VERSION}.zip
-    - wget --no-verbose --output-document f2cblaslapack-3.4.2.q4.tar.gz http://ftp.mcs.anl.gov/pub/petsc/externalpackages/f2cblaslapack-3.4.2.q4.tar.gz
     - wget --no-verbose --output-document lis-${LIS_VERSION}.zip https://github.com/anishida/lis/archive/refs/tags/${LIS_VERSION}.zip
     - wget --no-verbose --output-document hdf5-${HDF5_VERSION}.zip https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-${HDF5_VERSION//./_}.zip
     - wget --no-verbose --output-document vtk-v${VTK_VERSION}.zip https://github.com/Kitware/VTK/archive/refs/tags/v${VTK_VERSION}.zip
@@ -103,5 +102,4 @@ offline configure:
       rm CMakeCache.txt
       cmake ../../ogs -B . -G Ninja --preset release-petsc \
         -DOGS_DOWNLOAD_CPM_CACHE=ON \
-        -DOGS_USE_MFRONT=ON -DOGS_USE_LIS=ON -DOGS_EXTERNAL_DEPENDENCIES_CACHE=./ext \
-        -DOGS_PETSC_CONFIG_OPTIONS="--download-f2cblaslapack=$PWD/ext/f2cblaslapack-3.4.2.q4.tar.gz"
+        -DOGS_USE_MFRONT=ON -DOGS_USE_LIS=ON -DOGS_EXTERNAL_DEPENDENCIES_CACHE=./ext

scripts/cmake/DependenciesExternalProject.cmake

@@ -164,9 +164,9 @@ if(OGS_USE_PETSC)
             LOG_OUTPUT_ON_FAILURE ON
             CONFIGURE_COMMAND
                 ./configure
-                --download-f2cblaslapack=1
                 --prefix=<INSTALL_DIR>
-                --download-hypre
+                --download-f2cblaslapack=1
+                --download-hypre=1
                 --with-debugging=$<CONFIG:Debug>
                 ${_configure_opts}
                 ${OGS_PETSC_CONFIG_OPTIONS}

web/data/versions.json

@@ -16,7 +16,7 @@
     "eigen": "3.4.0",
     "eigen-unsupported": "9441d94dccccd5db8d64179516fdc5b53994a047",
     "vtk": "9.1.0",
-    "petsc": "3.16.1",
+    "petsc": "3.18.6",
     "qt": "5.14.2",
     "python": "3.6",
     "snakemake": "7.20.0",
@@ -75,7 +75,7 @@
     "package_file_sha256": "fe5b6489d66351dfac09622ac53d3fd987b2b7d81df01038ad0c2e316d6a3ebd"
   },
   "ext": {
-    "cache_hash": "8621cb642359944025c34dc50eafc8ee8155c710"
+    "cache_hash": "5063f1593404ca5e61365e327a09cb3a1edcea1c"
   },
   "libraries": {
     "vtk": {