diff --git a/.gitattributes b/.gitattributes index 3c92c4bd48ef2483ed5c5b140b797beb6b042f1e..3491fef384e96c6cd631cf09ed33fff110e36ef5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -8,7 +8,3 @@ *.h hooks.style=uncrustify *.cpp hooks.style=uncrustify *.hpp hooks.style=uncrustify - -# git archive ignores -Tests/Data export-ignore -web/content export-ignore diff --git a/scripts/ci/jobs/package.yml b/scripts/ci/jobs/package.yml index 586fad8e534809ab4f53a7da0b85ad6ba6dc0bc7..9ee6cee6dc50745073ea67bb15b404fe232dec51 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 + - 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 @@ -102,4 +103,5 @@ 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_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" diff --git a/web/data/versions.json b/web/data/versions.json index 83ae1cb558d3bfa6e2a701ff500dfa185826a6a0..83312219753aacc1bf5e5bdcbc9cdec88a726807 100644 --- a/web/data/versions.json +++ b/web/data/versions.json @@ -75,7 +75,7 @@ "package_file_sha256": "fe5b6489d66351dfac09622ac53d3fd987b2b7d81df01038ad0c2e316d6a3ebd" }, "ext": { - "cache_hash": "4ebd62e0ce484732dbf3cd9932f60b67762e156b" + "cache_hash": "8621cb642359944025c34dc50eafc8ee8155c710" }, "libraries": { "vtk": {