Skip to content
Snippets Groups Projects
Commit 55b433d7 authored by Adrien Crovato's avatar Adrien Crovato
Browse files

Update ci

parent aea2a2e8
No related branches found
No related tags found
1 merge request!1Version 0.1.0 (setup)
Pipeline #2141 failed
This commit is part of merge request !1. Comments created here will be created in the context of that merge request.
...@@ -14,15 +14,16 @@ variables: ...@@ -14,15 +14,16 @@ variables:
GIT_CLONE_PATH: /builds/$CI_PROJECT_PATH/FPM_BUILD/fpm # cannot work in /builds/$CI_PROJECT_PATH GIT_CLONE_PATH: /builds/$CI_PROJECT_PATH/FPM_BUILD/fpm # cannot work in /builds/$CI_PROJECT_PATH
stages: stages:
- build # only 1 stage to avoid exporting artifacts in parent dir (not permitted) - bld_tst
- fmt_dox
build_test: build_test:
<<: *global_tag_def <<: *global_tag_def
stage: build stage: bld_tst
script: script:
- printenv | sort - printenv | sort
- cd .. - cd ..
# get waves and build # get and build waves
- rm -rf waves - rm -rf waves
- wget -q https://gitlab.uliege.be/am-dept/waves/-/archive/master/waves-master.tar.bz2 - wget -q https://gitlab.uliege.be/am-dept/waves/-/archive/master/waves-master.tar.bz2
- tar xf waves-master.tar.bz2 - tar xf waves-master.tar.bz2
...@@ -33,13 +34,14 @@ build_test: ...@@ -33,13 +34,14 @@ build_test:
- cd build - cd build
- cmake -Wno-dev -C ../CMake/disable-trilinos.cmake .. - cmake -Wno-dev -C ../CMake/disable-trilinos.cmake ..
- make -j $(nproc) - make -j $(nproc)
# build fpm # build and test fpm
- cd ../../fpm - cd ../../fpm
- mkdir build - mkdir build
- cd build - cd build
- cmake -DCMAKE_PREFIX_PATH=${CI_PROJECT_DIR}/../waves -Wno-dev .. - cmake -DCMAKE_PREFIX_PATH=${CI_PROJECT_DIR}/../waves -Wno-dev ..
- make -j $(nproc) - make -j $(nproc)
- ctest -j $(nproc) --output-on-failure #--verbose - ctest -j $(nproc) --output-on-failure #--verbose
- mv ${CI_PROJECT_DIR}/../waves/scripts/format_code.py . # ulgy way to keep a script we need later...
#timeout: 10 hours # will be available in 12.3 #timeout: 10 hours # will be available in 12.3
artifacts: artifacts:
paths: paths:
...@@ -48,11 +50,11 @@ build_test: ...@@ -48,11 +50,11 @@ build_test:
format: format:
<<: *global_tag_def <<: *global_tag_def
stage: build stage: fmt_dox
script: script:
- ls ${CI_PROJECT_DIR}/..
- clang-format --version # we use clang-format-10 exclusively - clang-format --version # we use clang-format-10 exclusively
- ${CI_PROJECT_DIR}/../waves/scripts/format_code.py - ls build
- ./build/format_code.py
- mkdir -p patches - mkdir -p patches
- if git diff --patch --exit-code > patches/clang-format.patch; then echo "Clang format changed nothing"; else echo "Clang format found changes to make!"; false; fi - if git diff --patch --exit-code > patches/clang-format.patch; then echo "Clang format changed nothing"; else echo "Clang format found changes to make!"; false; fi
artifacts: artifacts:
...@@ -67,7 +69,7 @@ format: ...@@ -67,7 +69,7 @@ format:
doxygen: doxygen:
<<: *global_tag_def <<: *global_tag_def
stage: build stage: fmt_dox
script: script:
- cd build - cd build
- make dox - make dox
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment