diff --git a/.gitlab-ci.d/code-quality.yaml b/.gitlab-ci.d/code-quality.yaml index 5fdc1b0ba..0a89fbe0d 100644 --- a/.gitlab-ci.d/code-quality.yaml +++ b/.gitlab-ci.d/code-quality.yaml @@ -1,63 +1,63 @@ .code_quality_common: stage: code_quality allow_failure: true rules: - if: "$CODE_QUALITY_DISABLED" when: never - if: "$CI_COMMIT_TAG || $CI_COMMIT_BRANCH" .code_quality_gitlab_template: extends: - .code_quality_common image: docker:20.10.18 allow_failure: true services: - docker:20.10.18-dind variables: DOCKER_DRIVER: overlay2 DOCKER_TLS_CERTDIR: "" - CODE_QUALITY_IMAGE: "registry.gitlab.com/gitlab-org/ci-cd/codequality:0.85.29" + CODE_QUALITY_IMAGE: "registry.gitlab.com/gitlab-org/ci-cd/codequality:0.87.0" needs: [] script: - export SOURCE_CODE=$PWD - | if ! docker info &>/dev/null; then if [ -z "$DOCKER_HOST" -a "$KUBERNETES_PORT" ]; then export DOCKER_HOST='tcp://localhost:2375' fi fi - | # this is required to avoid undesirable reset of Docker image ENV variables being set on build stage function propagate_env_vars() { CURRENT_ENV=$(printenv) for VAR_NAME; do echo $CURRENT_ENV | grep "${VAR_NAME}=" > /dev/null && echo "--env $VAR_NAME " done } - docker pull --quiet "$CODE_QUALITY_IMAGE" - | docker run --rm \ $(propagate_env_vars \ SOURCE_CODE \ TIMEOUT_SECONDS \ CODECLIMATE_DEBUG \ CODECLIMATE_DEV \ REPORT_STDOUT \ REPORT_FORMAT \ ENGINE_MEMORY_LIMIT_BYTES \ CODECLIMATE_PREFIX \ ) \ --volume "$PWD":/code \ --volume /var/run/docker.sock:/var/run/docker.sock \ "$CODE_QUALITY_IMAGE" /code .clang_tools: extends: - .code_quality_common - .debian_bullseye_clang before_script: - if [ 'x${CI_MERGE_REQUEST_ID}' != 'x' ]; then - git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME - git diff --name-only $CI_COMMIT_SHA $CI_MERGE_REQUEST_TARGET_BRANCH_NAME > file_list - FILE_LIST_ARG='-f file_list' - fi diff --git a/.gitlab-ci.d/images.yaml b/.gitlab-ci.d/images.yaml index d5b95463d..fed0d5d03 100644 --- a/.gitlab-ci.d/images.yaml +++ b/.gitlab-ci.d/images.yaml @@ -1,117 +1,113 @@ .docker_build: image: "docker:20.10.18" stage: .pre services: - docker:20.10.18-dind variables: # Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled DOCKER_HOST: tcp://docker:2376 DOCKER_TLS_CERTDIR: "/certs" before_script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY script: - cd test/ci/${IMAGE_NAME}/ - docker build --no-cache -t registry.gitlab.com/akantu/akantu/${IMAGE_NAME} . - docker push registry.gitlab.com/akantu/akantu/${IMAGE_NAME} rules: - changes: - test/ci/${IMAGE_NAME}/* # ------------------------------------------------------------------------------ .cache_build: variables: CCACHE_BASEDIR: ${CI_PROJECT_DIR}/ CCACHE_DIR: ${CI_PROJECT_DIR}/.ccache CCACHE_MAXSIZE: 1Gi cache: key: ${output}_${BUILD_TYPE} - policy: pull-push paths: - .ccache/ - - third-party/google-test - - third-party/pybind11 - - third-party/eigen3 before_script: - ccache --zero-stats || true after_script: - ccache --show-stats || true # ------------------------------------------------------------------------------ .image_debian_bullseye: image: registry.gitlab.com/akantu/akantu/debian:bullseye .image_ubuntu_lts: image: registry.gitlab.com/akantu/akantu/ubuntu:lts .image_manylinux: image: registry.gitlab.com/akantu/akantu/manylinux:2010_x86_64 # ------------------------------------------------------------------------------ .compiler_gcc: variables: CC: /usr/lib/ccache/gcc CXX: /usr/lib/ccache/g++ FC: gfortran GCOV_EXECUTABLE: gcov .compiler_gcc_ubuntu: variables: CC: /usr/lib/ccache/gcc-8 CXX: /usr/lib/ccache/g++-8 FC: /usr/bin/gfortran-8 GCOV_EXECUTABLE: gcov .compiler_clang: variables: CC: /usr/lib/ccache/clang CXX: /usr/lib/ccache/clang++ FC: gfortran GCOV_EXECUTABLE: llvm-cov gcov .build_coverage: variables: TEST_EXAMPLES: "FALSE" BUILD_TYPE: "Coverage" .build_release: variables: TEST_EXAMPLES: "TRUE" BUILD_TYPE: "Release" .build_valgrind: variables: TEST_EXAMPLES: "FALSE" BUILD_TYPE: "Valgrind" # ------------------------------------------------------------------------------ .debian_bullseye_gcc: variables: output: debian_bullseye_gcc extends: - .compiler_gcc - .image_debian_bullseye - .cache_build .debian_bullseye_clang: variables: output: debian_bullseye_clang extends: - .compiler_clang - .image_debian_bullseye - .cache_build .ubuntu_lts_gcc: variables: output: ubuntu_lts_gcc extends: - .compiler_gcc_ubuntu - .image_ubuntu_lts - .cache_build .manylinux_2010_x64_gcc: variables: output: manylinux_2010_x64_gcc extends: - .compiler_gcc - .image_manylinux - .cache_build diff --git a/.gitlab-ci.d/templates.yaml b/.gitlab-ci.d/templates.yaml index 837ddca57..cdd84d479 100644 --- a/.gitlab-ci.d/templates.yaml +++ b/.gitlab-ci.d/templates.yaml @@ -1,158 +1,166 @@ # yaml-language-server: $format.enable=false, $schemaStore.enable=true, $schemas=gitlab-ci # Configuration template .configure: stage: configure variables: BLA_VENDOR: "Generic" CMAKE_GENERATOR: "Unix Makefiles" # CMAKE_GENERATOR: 'Ninja' + cache: + - key: ${CI_COMMIT_REF_SLUG}-third-party + policy: push + paths: + - third-party/eigen3 + - third-party/pybind11 + - third-party/google-test script: # Create the build folder - cmake -E make_directory build - cd build - echo BUILD_TYPE=${BUILD_TYPE} # Configure the project - cmake -DAKANTU_COHESIVE_ELEMENT:BOOL=TRUE -DAKANTU_IMPLICIT:BOOL=TRUE -DAKANTU_IMPLICIT_SOLVER:STRING="Mumps" -DAKANTU_PARALLEL:BOOL=TRUE -DAKANTU_STRUCTURAL_MECHANICS:BOOL=TRUE -DAKANTU_HEAT_TRANSFER:BOOL=TRUE -DAKANTU_DAMAGE_NON_LOCAL:BOOL=TRUE -DAKANTU_PHASE_FIELD:BOOL=TRUE -DAKANTU_PYTHON_INTERFACE:BOOL=TRUE -DAKANTU_CONTACT_MECHANICS:BOOL=TRUE -DAKANTU_EXAMPLES:BOOL=TRUE -DAKANTU_BUILD_ALL_EXAMPLES:BOOL=TRUE -DAKANTU_TESTS:BOOL=TRUE -DAKANTU_RUN_IN_DOCKER:BOOL=TRUE -DAKANTU_TEST_EXAMPLES:BOOL=${TEST_EXAMPLES} -DCMAKE_BUILD_TYPE:STRING=${BUILD_TYPE} -G "${CMAKE_GENERATOR}" .. # Copy the compile commands for the code quality - if [ -e compile_commands.json ]; then - cp compile_commands.json .. - fi artifacts: when: on_success paths: - build - compile_commands.json expire_in: 10h # Build the libraries .build_libs: stage: build_libs script: - echo BUILD_TYPE=${BUILD_TYPE} - cmake --build build/src > >(tee -a build-${output}-out.log) 2> >(tee -a build-${output}-err.log >&2) - cmake --build build/python > >(tee -a build-${output}-out.log) 2> >(tee -a build-${output}-err.log >&2) cache: - key: ${output}_${BUILD_TYPE}_build_${CI_COMMIT_SHORT_SHA} - policy: push - paths: - - build/ - - third-party/eigen3 + - key: ${output}_${BUILD_TYPE}_build_${CI_COMMIT_SHORT_SHA} + policy: push + paths: + - build/ + - key: ${CI_COMMIT_REF_SLUG}-third-party + policy: pull artifacts: when: on_success paths: - build-${output}-err.log - compile_commands.json expire_in: 10h timeout: 5h # build the tests .build_tests: stage: build_tests script: - cmake --build build/test > >(tee -a build-${output}-out.log) 2> >(tee -a build-${output}-err.log >&2) - cmake --build build/examples > >(tee -a build-${output}-out.log) 2> >(tee -a build-${output}-err.log >&2) cache: - key: ${output}_${BUILD_TYPE}_build_${CI_COMMIT_SHORT_SHA} - policy: pull-push - paths: - - build/ - - third-party/eigen3 + - key: ${output}_${BUILD_TYPE}_build_${CI_COMMIT_SHORT_SHA} + policy: pull-push + paths: + - build/ + - key: ${CI_COMMIT_REF_SLUG}-third-party + policy: pull artifacts: when: on_success paths: - build-${output}-err.log - compile_commands.json expire_in: 10h # Build all .build_all: stage: build_libs script: - cmake --build build/src > >(tee -a build-${output}-out.log) 2> >(tee -a build-${output}-err.log >&2) - cmake --build build/python > >(tee -a build-${output}-out.log) 2> >(tee -a build-${output}-err.log >&2) - cmake --build build/test/ > >(tee -a build-${output}-out.log) 2> >(tee -a build-${output}-err.log >&2) - cmake --build build/examples > >(tee -a build-${output}-out.log) 2> >(tee -a build-${output}-err.log >&2) artifacts: when: on_success paths: - build/ - build-${output}-err.log - compile_commands.json exclude: - build/**/*.o expire_in: 10h timeout: 5h # Run the tests .tests: stage: test script: - cd build - ctest -T test --output-on-failure --no-compress-output --timeout 1800 after_script: - cd build - tag=$(head -n 1 < Testing/TAG) - if [ -e Testing/${tag}/Test.xml ]; then - xsltproc -o ./juint.xml ${CI_PROJECT_DIR}/test/ci/ctest2junit.xsl Testing/${tag}/Test.xml; - fi - if [ ${BUILD_TYPE} = "Coverage" ]; then - gcovr --xml --gcov-executable "${GCOV_EXECUTABLE}" --xml-pretty --exclude-unreachable-branches --print-summary --output coverage.xml --object-directory ${CI_PROJECT_DIR}/build --root ${CI_PROJECT_DIR} -s || true - fi cache: key: ${output}_${BUILD_TYPE}_build_${CI_COMMIT_SHORT_SHA} policy: pull - artifacts: when: always expire_in: 2 days paths: - build/juint.xml - build/coverage.xml reports: junit: - build/juint.xml coverage_report: coverage_format: cobertura path: build/coverage.xml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae063c0b4..720528136 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,407 +1,416 @@ # yaml-language-server: $schema=gitlab-ci # yaml-language-server: $format.enable=false stages: - version - configure - build_libs - build_tests - test - code_quality - deploy include: local: '.gitlab-ci.d/*.yaml' #------------------------------------------------------------------------------- # Rebuilding the docker images if needed #------------------------------------------------------------------------------- docker build:debian-bullseye: variables: IMAGE_NAME: debian:bullseye extends: .docker_build docker build:ubuntu-lts: variables: IMAGE_NAME: ubuntu:lts extends: .docker_build docker build:manylinux: variables: IMAGE_NAME: manylinux:2010_x86_64 extends: .docker_build version_determination: stage: version image: python:latest variables: GIT_STRATEGY: fetch GIT_DEPTH: 0 script: - python3 cmake/semver.py > VERSION - cat VERSION artifacts: when: on_success paths: - VERSION expire_in: 1day # ------------------------------------------------------------------------------ # Debian bullseye compiled with GCC # ------------------------------------------------------------------------------ configure:debian_bullseye_gcc: extends: - .debian_bullseye_gcc - .build_release - .configure needs: - version_determination build_libs:debian_bullseye_gcc: extends: - .debian_bullseye_gcc - .build_release - .build_libs needs: - job: configure:debian_bullseye_gcc build_tests:debian_bullseye_gcc: extends: - .debian_bullseye_gcc - .build_release - .build_tests needs: - job: build_libs:debian_bullseye_gcc test:debian_bullseye_gcc: extends: - .debian_bullseye_gcc - .build_release - .tests coverage: '/^lines: (\d+\.\d+\%)/' needs: - job: build_tests:debian_bullseye_gcc # ------------------------------------------------------------------------------ # Debian bullseye compiled with Clang # ------------------------------------------------------------------------------ configure:debian_bullseye_clang: extends: - .debian_bullseye_clang - .build_release - .configure needs: - version_determination build_libs:debian_bullseye_clang: extends: - .debian_bullseye_clang - .build_release - .build_libs needs: - job: configure:debian_bullseye_clang build_tests:debian_bullseye_clang: extends: - .debian_bullseye_clang - .build_release - .build_tests needs: - job: build_libs:debian_bullseye_clang test:debian_bullseye_clang: extends: - .debian_bullseye_clang - .build_release - .tests coverage: '/^lines: (\d+\.\d+\%)/' needs: - job: build_tests:debian_bullseye_clang # ------------------------------------------------------------------------------ # Ubuntu LTS compiled with GCC # ------------------------------------------------------------------------------ configure:ubuntu_lts_gcc: extends: - .ubuntu_lts_gcc - .build_release - .configure needs: - version_determination build_libs:ubuntu_lts_gcc: extends: - .ubuntu_lts_gcc - .build_release - .build_libs needs: - job: configure:ubuntu_lts_gcc build_tests:ubuntu_lts_gcc: extends: - .ubuntu_lts_gcc - .build_release - .build_tests needs: - job: build_libs:ubuntu_lts_gcc test:ubuntu_lts_gcc: extends: - .ubuntu_lts_gcc - .build_release - .tests needs: - job: build_tests:ubuntu_lts_gcc # ------------------------------------------------------------------------------ # Debian bullseye compiled with GCC tested with valgrind # ------------------------------------------------------------------------------ configure:ubuntu_lts_gcc_valgrind: extends: - .ubuntu_lts_gcc - .build_valgrind - .configure needs: - version_determination build_libs:ubuntu_lts_gcc_valgrind: extends: - .ubuntu_lts_gcc - .build_valgrind - .build_libs needs: - job: configure:ubuntu_lts_gcc_valgrind build_tests:ubuntu_lts_gcc_valgrind: extends: - .ubuntu_lts_gcc - .build_valgrind - .build_tests needs: - job: build_libs:ubuntu_lts_gcc_valgrind test:ubuntu_lts_gcc_valgrind: extends: - .ubuntu_lts_gcc - .build_valgrind - .tests needs: - job: build_tests:ubuntu_lts_gcc_valgrind # ------------------------------------------------------------------------------ # Manylinux to build python packages # ------------------------------------------------------------------------------ configure:python_package: stage: configure extends: - .manylinux_2010_x64_gcc - .build_release script: # create the build folder - cmake -E make_directory build - cd build # Variables for cmake - export CMAKE_PREFIX_PATH=/softs/view - export BOOST_ROOT=/softs/view # Configure in sequential and without tests or examples - cmake -DAKANTU_COHESIVE_ELEMENT:BOOL=TRUE -DAKANTU_IMPLICIT:BOOL=TRUE -DAKANTU_PARALLEL:BOOL=FALSE -DAKANTU_STRUCTURAL_MECHANICS:BOOL=TRUE -DAKANTU_HEAT_TRANSFER:BOOL=TRUE -DAKANTU_DAMAGE_NON_LOCAL:BOOL=TRUE -DAKANTU_PHASE_FIELD:BOOL=TRUE -DAKANTU_PYTHON_INTERFACE:BOOL=FALSE -DAKANTU_CONTACT_MECHANICS:BOOL=TRUE -DAKANTU_EXAMPLES:BOOL=FALSE -DAKANTU_TESTS:BOOL=FALSE -DMUMPS_DETECT_DEBUG:BOOL=TRUE -DCMAKE_INSTALL_PREFIX:PATH=${CI_PROJECT_DIR}/install -DCMAKE_BUILD_TYPE:STRING=${BUILD_TYPE} .. needs: - version_determination artifacts: when: on_success paths: - build/ - VERSION expire_in: 10h build_akantu:python_package: extends: - .build_libs - .build_release - .manylinux_2010_x64_gcc script: - cmake --build build --target akantu -j1 - cmake --install build artifacts: when: on_success paths: - install/ - VERSION expire_in: 10h needs: - job: configure:python_package build_pip:python_package: stage: build_tests extends: - .build_release - .manylinux_2010_x64_gcc script: - export CI_AKANTU_INSTALL_PREFIX=${CI_PROJECT_DIR}/install - export CMAKE_PREFIX_PATH=/softs/view:${CI_AKANTU_INSTALL_PREFIX} - test/ci/make-wheels.sh needs: - job: build_akantu:python_package artifacts: when: on_success paths: - wheelhouse expire_in: 10h test:python_package: stage: test image: python:3.8 needs: - job: build_pip:python_package script: - pip install numpy scipy - pip install akantu --no-index --find-links=${PWD}/wheelhouse - python -c "import akantu" - cd examples/python/dynamics/ - apt update && apt install -y gmsh - gmsh -2 bar.geo - python ./dynamics.py package:python_gitlab: stage: deploy image: python:latest script: - pip install twine - TWINE_PASSWORD=${CI_JOB_TOKEN} TWINE_USERNAME=gitlab-ci-token python3 -m twine upload --repository-url https://gitlab.com/api/v4/projects/${CI_PROJECT_ID}/packages/pypi wheelhouse/* needs: - job: build_pip:python_package - job: test:python_package only: - master package:python_pypi: stage: deploy image: python:latest script: - pip install twine - TWINE_PASSWORD=${PYPI_TOKEN} TWINE_USERNAME=__token__ python3 -m twine upload --verbose wheelhouse/* needs: - job: build_pip:python_package - job: test:python_package only: - tags # ------------------------------------------------------------------------------ # Code Quality # ------------------------------------------------------------------------------ cq:code_quality: extends: - .code_quality_gitlab_template + cache: + - key: ${CI_COMMIT_REF_SLUG}-third-party + policy: pull needs: - job: configure:debian_bullseye_clang artifacts: paths: - gl-code-quality-report.json cq:clang_tidy: extends: - .clang_tools + cache: + - key: ${CI_COMMIT_REF_SLUG}-third-party + policy: pull script: - test/ci/scripts/cq -x third-party -x extra-packages -x pybind11 -x test -x build ${FILE_LIST_ARG} clang-tidy -p ${CI_PROJECT_DIR}/build > gl-clang-tidy-report.json needs: - job: configure:debian_bullseye_clang artifacts: paths: - gl-clang-tidy-report.json cq:clang_format: extends: - .clang_tools + cache: + - key: ${CI_COMMIT_REF_SLUG}-third-party + policy: pull script: - test/ci/scripts/cq -x third-party -x extra-packages -x build clang-format -p ${CI_PROJECT_DIR}/build > gl-clang-format-report.json needs: - job: configure:debian_bullseye_clang artifacts: paths: - gl-clang-format-report.json cq:compilation_warnings: stage: code_quality image: python:latest script: - pip install warning-parser termcolor Click - ls build-*-err.log - test/ci/scripts/cq -x third-party -x extra-packages -x build warnings build-*-err.log > gl-warnings-report.json needs: - job: build_libs:debian_bullseye_clang - job: build_libs:debian_bullseye_gcc - job: build_libs:ubuntu_lts_gcc artifacts: paths: - gl-warnings-report.json cq:merge_code_quality: stage: deploy extends: - .debian_bullseye_clang script: - jq -Ms '[.[][]]' gl-*-report.json | tee gl-codequality.json | jq -C needs: - job: cq:code_quality - job: cq:clang_tidy - job: cq:clang_format - job: cq:compilation_warnings artifacts: reports: codequality: [gl-codequality.json] # ------------------------------------------------------------------------------ # Deploy pages # ------------------------------------------------------------------------------ pages: stage: deploy extends: - .debian_bullseye_gcc script: - cd build - cmake -DAKANTU_DOCUMENTATION=ON .. - cmake --build . -t sphinx-doc - mv doc/dev-doc/html ../public needs: - job: configure:debian_bullseye_gcc artifacts: paths: - public only: - master