diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c6f74696afd9a90b33463423a443f1ed72189972..0f2358a334912e33e4e896f5f7ae52adb5dac036 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ dev images: - if: $CI_COMMIT_BRANCH == "main" script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - black --check ogscm + - black --diff --check ogscm - poetry install - poetry run ogscm compiler.py ogs.py -B --ogs off --cpu-target $CPU_TARGET - poetry run ogscm compiler.py ogs.py ogs_jupyter.py -B -R --build_args ' --progress=plain' --cvode --ccache --cpmcache --mfront --cpu-target $CPU_TARGET --cmake_args ' -DOGS_CPU_ARCHITECTURE=OFF -DOGS_BUILD_TESTING=OFF -DOGS_BUILD_PROCESSES=SteadyStateDiffusion' --runtime_base_image 'registry.opengeosys.org/ogs/ogs/jupyter/base-notebook-ubuntu:22.04_3.10' diff --git a/ogscm/recipes/ogs.py b/ogscm/recipes/ogs.py index 92eb2303df18d995f7a46b81c6c47ada4756fde7..af473f08433dc0d8665ebff33996b91fccd9be2f 100644 --- a/ogscm/recipes/ogs.py +++ b/ogscm/recipes/ogs.py @@ -529,9 +529,14 @@ if local_args.ogs != "clean": "--CXXFLAGS='-O3'", "--FFLAGS='-O3'", "--with-debugging=no", - "--download-f2cblaslapack=1", ] petsc_configure_opts.extend(petsc_args) + if "--download-f2cblaslapack" not in local_args.petsc_configure_args: + petsc_configure_opts.extend( + [ + "--download-f2cblaslapack=1", + ] + ) Stage0 += generic_autotools( configure_opts=petsc_configure_opts, devel_environment={"CMAKE_PREFIX_PATH": "/usr/local/petsc"},