From 7b1d0285e4312f79baea4966c6eba63279045859 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 22 Dec 2023 08:41:31 +0100
Subject: [PATCH] [ci] Fix container job.
---
scripts/ci/jobs/package.yml | 1 +
scripts/cmake/DependenciesExternalProject.cmake | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/scripts/ci/jobs/package.yml b/scripts/ci/jobs/package.yml
index 9ee6cee6dc5..168cd66108d 100644
--- a/scripts/ci/jobs/package.yml
+++ b/scripts/ci/jobs/package.yml
@@ -62,6 +62,7 @@ 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
+ # Remove after upgrading PETSc to > 3.18
- 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
diff --git a/scripts/cmake/DependenciesExternalProject.cmake b/scripts/cmake/DependenciesExternalProject.cmake
index 297fad4c3b9..80e284447d4 100644
--- a/scripts/cmake/DependenciesExternalProject.cmake
+++ b/scripts/cmake/DependenciesExternalProject.cmake
@@ -159,12 +159,18 @@ if(OGS_USE_PETSC)
endif()
unset(ENV{PETSC_DIR})
+ # Remove after upgrading PETSc to > 3.18
+ file(
+ DOWNLOAD
+ http://ftp.mcs.anl.gov/pub/petsc/externalpackages/f2cblaslapack-3.4.2.q4.tar.gz
+ ${CMAKE_CURRENT_BINARY_DIR}/f2cblaslapack-3.4.2.q4.tar.gz
+ )
BuildExternalProject(
PETSc ${_petsc_source}
LOG_OUTPUT_ON_FAILURE ON
CONFIGURE_COMMAND
./configure
- --download-f2cblaslapack=1
+ --download-f2cblaslapack=${CMAKE_CURRENT_BINARY_DIR}/f2cblaslapack-3.4.2.q4.tar.gz
--prefix=<INSTALL_DIR>
--download-hypre
--with-debugging=$<CONFIG:Debug>
--
GitLab