Commit 4f781e08 authored by Daniel Wortmann's avatar Daniel Wortmann

Merge branch 'develop' of iffgit.fz-juelich.de:fleur/fleur into develop

parents 2764c703 e2562ceb
stages:
- build
- test
- coverage
- html
- deploy
- build-pgi
- test-pgi
- build-intel-static
- build-intel
- test-intel
build-gfortran-hdf5:
......@@ -18,6 +13,7 @@ build-gfortran-hdf5:
- build
script:
- cd /builds/fleur/fleur; ./configure.sh GITLAB; cd build; make -j 4
allow_failure: true
# only:
# - schedules
# - triggers
......@@ -31,6 +27,7 @@ test-gfortran-hdf5:
- build
script:
- ulimit -s unlimited ;export juDFT_MPI="mpirun -n 2 --allow-run-as-root ";export OMP_NUM_THREADS=4;cd /builds/fleur/fleur/build;ctest
allow_failure: true
artifacts:
when: on_failure
paths:
......@@ -40,21 +37,39 @@ test-gfortran-hdf5:
# - schedules
# - triggers
# - web
pages:
image: iffregistry.fz-juelich.de/fleur/fleur:latest
stage: deploy
cache:
paths:
- build
- public
script:
- echo "HTML should be ready from cache..."
- mv /builds/fleur/fleur/docs/Docu_main.html /builds/fleur/fleur/public/index.html
environment:
name: HTML-Pages
url: https://fleur.iffgit.fz-juelich.de/fleur
artifacts:
paths:
- public
only:
- schedules
- triggers
- web
doxygen:
image: iffregistry.fz-juelich.de/fleur/fleur:latest
stage: html
cache:
paths:
- build
- public
script:
- cd /builds/fleur/fleur/build ; make doc
- mv docs/html/ ../public/
- mv /builds/fleur/fleur/docs/Docu_main.html ../public/index.html
environment:
name: Doxygen
url: https://fleur.iffgit.fz-juelich.de/fleur
- mkdir ../public
- mv docs/html/ ../public/doxygen
artifacts:
paths:
- public
......@@ -66,19 +81,17 @@ pages:
- triggers
- web
pages2:
mkdocs:
image: iffregistry.fz-juelich.de/fleur/fleur:mkdocs
stage: deploy
stage: html
cache:
paths:
- public
script:
- cd /builds/fleur/fleur/docs/mkdocs ; mkdocs build
- cp tutorial_scheme/color.css site/css/base/css
- mv site ../public/
environment:
name: mkdocs
url: https://fleur.iffgit.fz-juelich.de/fleur
- cp tutorial_scheme/color.css site/css/base.css
- mkdir ../../public
- mv site ../../public/site
artifacts:
paths:
- public
......@@ -89,12 +102,13 @@ pages2:
build-pgi:
image: iffregistry.fz-juelich.de/fleur/fleur:pgi
stage: build-pgi
stage: build
cache:
paths:
- build.pgi
script:
- cd /builds/fleur/fleur; ./configure.sh -l pgi ; cd build.pgi; make
allow_failure: true
only:
- schedules
- triggers
......@@ -103,12 +117,15 @@ build-pgi:
test-pgi:
image: iffregistry.fz-juelich.de/fleur/fleur:pgi
stage: test-pgi
stage: test
dependencies:
- build-pgi
cache:
paths:
- build.pgi
script:
- cd /builds/fleur/fleur/build.pgi;ctest
allow_failure: true
only:
- schedules
- web
......@@ -117,7 +134,7 @@ test-pgi:
build-intel-static:
image: iffregistry.fz-juelich.de/fleur/fleur:intel-static
stage: build-intel-static
stage: build
cache:
paths:
- build.intel-static
......@@ -130,6 +147,7 @@ build-intel-static:
- build.intel-static/fleur
- build.intel-static/fleur_MPI
- build.intel-static/inpgen
allow_failure: true
only:
- schedules
- triggers
......@@ -138,13 +156,14 @@ build-intel-static:
build-intel:
image: iffregistry.fz-juelich.de/fleur/fleur:intel-static
stage: build-intel
stage: build
cache:
paths:
- build.intel.debug
script:
- set +e && source compilervars.sh intel64 && set -e ; ulimit -s unlimited
- cd /builds/fleur/fleur; CC=gcc FC=mpiifort FLEUR_LIBRARIES="-lmkl_scalapack_lp64;-lmkl_blacs_intelmpi_lp64" ./configure.sh -t -d -l intel INTEL_MPI ; cd build.intel.debug; make -j 4
allow_failure: true
only:
- schedules
- triggers
......@@ -153,13 +172,16 @@ build-intel:
test-intel:
image: iffregistry.fz-juelich.de/fleur/fleur:intel-static
stage: test-intel
stage: test
dependencies:
- build-intel
cache:
paths:
- build.intel.debug
script:
- set +e && source compilervars.sh intel64 && set -e; ulimit -s unlimited
- cd /builds/fleur/fleur/build.intel.debug;ctest
allow_failure: true
artifacts:
when: on_failure
paths:
......@@ -172,7 +194,7 @@ test-intel:
gfortran-coverage:
image: iffregistry.fz-juelich.de/fleur/fleur:latest
stage: coverage
stage: html
cache:
paths:
- build
......@@ -184,6 +206,7 @@ gfortran-coverage:
- lcov --add-tracefile baseline.info --add-tracefile after.info -o combined.info
- genhtml combined.info --output-directory html_out
- mkdir ../public;mv html_out ../public/coverage_html
allow_failure: true
artifacts:
paths:
- public
......
......@@ -29,6 +29,7 @@ if test -d $DIR/.git
then
echo "Git version found"
else
mkdir -p $DIR/.git/hooks
ln -s $DIR/tests/git-hooks/pre-commit $DIR/.git/hooks
echo "Git version found, hook installed"
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment