Skip to content
Permalink
Browse files

Merge branch 'doxy-style-stage' into jobs-1

  • Loading branch information...
jngrad committed May 14, 2019
2 parents ea71ab1 + e28b5fc commit 830de1e6c14916ef63cf6619de82a8c2ec154888
Showing with 30 additions and 12 deletions.
  1. +24 −10 .gitlab-ci.yml
  2. +1 −1 doc/doxygen/Doxyfile.in
  3. +0 −1 maintainer/CI/build_cmake.sh
  4. +5 −0 maintainer/CI/dox_warnings.sh
@@ -65,6 +65,21 @@ style:
expire_in: 1 week
when: on_failure

style_doxygen:
<<: *global_job_definition
stage: prepare
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/cuda:9.0
dependencies: []
script:
- mkdir build
- cd build
- cp ../maintainer/configs/maxset.hpp myconfig.hpp
- cmake ..
- bash ../maintainer/CI/dox_warnings.sh
tags:
- docker
- linux

### Builds without CUDA

default:
@@ -167,7 +182,7 @@ cuda-maxset:
stage: build
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/cuda:9.0
script:
- export cuda_job=true myconfig=maxset with_coverage=true python_version=3 test_timeout=900 srcdir=${CI_PROJECT_DIR}
- export myconfig=maxset with_coverage=true python_version=3 test_timeout=900 srcdir=${CI_PROJECT_DIR}
- bash maintainer/CI/build_cmake.sh
artifacts:
paths:
@@ -183,7 +198,7 @@ tutorials-samples-maxset:
stage: build
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/cuda:tutorials
script:
- export cuda_job=true myconfig=maxset with_coverage=false python_version=3 make_check=false make_check_tutorials=true make_check_samples=true test_timeout=1200
- export myconfig=maxset with_coverage=false python_version=3 make_check=false make_check_tutorials=true make_check_samples=true test_timeout=1200
- bash maintainer/CI/build_cmake.sh
tags:
- docker
@@ -195,7 +210,7 @@ tutorials-samples-default:
stage: build
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/cuda:tutorials
script:
- export cuda_job=true myconfig=default with_coverage=false python_version=3 make_check=false make_check_tutorials=true make_check_samples=true test_timeout=1200
- export myconfig=default with_coverage=false python_version=3 make_check=false make_check_tutorials=true make_check_samples=true test_timeout=1200
- bash maintainer/CI/build_cmake.sh
tags:
- docker
@@ -209,7 +224,7 @@ tutorials-samples-empty:
stage: build
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/cuda:tutorials
script:
- export cuda_job=true myconfig=empty with_coverage=false python_version=3 make_check=false make_check_tutorials=true make_check_samples=true test_timeout=1200
- export myconfig=empty with_coverage=false python_version=3 make_check=false make_check_tutorials=true make_check_samples=true test_timeout=1200
- bash maintainer/CI/build_cmake.sh
tags:
- docker
@@ -223,7 +238,7 @@ tutorials-samples-no-gpu:
stage: build
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/cuda:tutorials
script:
- export cuda_job=true myconfig=maxset with_coverage=false python_version=3 make_check=false make_check_tutorials=true make_check_samples=true test_timeout=1200 hide_gpu=true
- export myconfig=maxset with_coverage=false python_version=3 make_check=false make_check_tutorials=true make_check_samples=true test_timeout=1200 hide_gpu=true
- bash maintainer/CI/build_cmake.sh
tags:
- docker
@@ -239,7 +254,7 @@ cuda-no-gpu:
stage: build
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/cuda:9.0
script:
- export cuda_job=true myconfig=maxset hide_gpu=true python_version=3 test_timeout=900
- export myconfig=maxset hide_gpu=true python_version=3 test_timeout=900
- bash maintainer/CI/build_cmake.sh
tags:
- docker
@@ -344,7 +359,7 @@ clang:6.0:
stage: build
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/$CI_JOB_NAME
script:
- export cuda_job=true myconfig=maxset with_coverage=false with_static_analysis=true with_asan=true with_ubsan=true test_timeout=900
- export myconfig=maxset with_coverage=false with_static_analysis=true with_asan=true with_ubsan=true test_timeout=900
- bash maintainer/CI/build_cmake.sh
tags:
- docker
@@ -357,7 +372,7 @@ intel:18:
stage: build
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/$CI_JOB_NAME
script:
- export cuda_job=true myconfig=maxset with_coverage=false I_MPI_SHM_LMT=shm
- export myconfig=maxset with_coverage=false I_MPI_SHM_LMT=shm
- export cxx_flags=-O2
- bash maintainer/CI/build_cmake.sh
tags:
@@ -395,7 +410,6 @@ check_doxygen:
script:
- cd ${CI_PROJECT_DIR}/build
- make -t && make doxygen
- bash ../maintainer/CI/dox_warnings.sh
artifacts:
paths:
- build/doc/doxygen
@@ -411,7 +425,7 @@ check_with_odd_no_of_processors:
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/cuda:9.0
when: on_success
script:
- export cuda_job=true myconfig=maxset with_coverage=true python_version=3 build_procs=3 check_procs=3 check_odd_only=true
- export myconfig=maxset with_coverage=true python_version=3 build_procs=3 check_procs=3 check_odd_only=true
- bash maintainer/CI/build_cmake.sh
tags:
- docker
@@ -685,7 +685,7 @@ RECURSIVE = YES
# Note that relative paths are relative to the directory from which doxygen is
# run.

EXCLUDE = $(SRCDIR)/src/core/myconfig-default.hpp $(SRCDIR)/src/core/observables/not_yet_implemented
EXCLUDE = $(SRCDIR)/src/core/myconfig-default.hpp

# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
@@ -42,7 +42,6 @@ function end {

# execute and output a command
# handle environment variables
[ -z "$cuda_job" ] && cuda_job="false"
[ -z "$insource" ] && insource="false"
[ -z "$srcdir" ] && srcdir=`pwd`
[ -z "$cmake_params" ] && cmake_params=""
@@ -58,6 +58,11 @@ make doxygen
# restore Doxyfile
mv doc/doxygen/Doxyfile.bak doc/doxygen/Doxyfile

# print enabled features
if [ "${CI}" != "" ]; then
cat doc/doxygen/doxy-features
fi

# find @param without description
grep -Prn '^[\ \t]*(?:\*?[\ \t]+)?[@\\]t?param(?:\[[in, out]+\])?[\ \t]+[a-zA-Z0-9_\*]+[\ \t]*$' "${srcdir}/src" > doc/doxygen/empty-params.log

0 comments on commit 830de1e

Please sign in to comment.
You can’t perform that action at this time.