Skip to content
Snippets Groups Projects
Commit 5d030a1b authored by Stéphane Del Pino's avatar Stéphane Del Pino
Browse files

Merge branch 'update/gitlab-ci' into 'develop'

Update/gitlab ci

See merge request !50
parents d738bc37 8211e522
Branches
Tags
1 merge request!50Update/gitlab ci
......@@ -5,6 +5,7 @@ build/
CMakeFiles/
CMakeCache.txt
.\#*
.*.swp
.DS_Store
/compile_commands.json
GPATH
......
......@@ -7,9 +7,10 @@ variables:
CTEST_OUTPUT_ON_FAILURE: 1
include:
- local: '/.gitlab-ci/gcc8-seq-dbg.yml'
- local: '/.gitlab-ci/gcc8-seq-release.yml'
- local: '/.gitlab-ci/clang10-seq-release.yml'
- local: '/.gitlab-ci/clang10-mpi-debug.yml'
- local: '/.gitlab-ci/clang10-mpi-release.yml'
- local: '/.gitlab-ci/clang10-seq-coverage.yml'
- local: '/.gitlab-ci/clang10-mpi-coverage.yml'
- local: '/.gitlab-ci/gcc10-mpi-debug.yml'
- local: '/.gitlab-ci/gcc10-mpi-coverage.yml'
- local: '/.gitlab-ci/gcc10-mpi-release.yml'
- local: '/.gitlab-ci/gcc10-seq-coverage.yml'
- local: '/.gitlab-ci/gcc10-seq-release.yml'
coverage:clang10-mpi-coverage:
image: localhost:5000/ubuntu_clang10_mpi
stage: coverage
script:
- mkdir -p build/clang10-cov-mpi
- cd build/clang10-cov-mpi
- CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage -DCLANG_FORMAT=/usr/bin/clang-format-10
- make pugs
- make coverage
cache:
key: "${CI_COMMIT_REF_SLUG}-clang10-cov-mpi"
paths:
- build/clang10-cov-mpi
untracked: true
build:clang10-seq-release:
image: localhost:5000/ubuntu_clang10
build:clang10-mpi-debug:
image: localhost:5000/ubuntu_clang10_mpi
stage: build
needs: []
script:
- mkdir -p build/clang10-release-seq
- cd build/clang10-release-seq
- CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCLANG_FORMAT=/usr/bin/clang-format-10
- mkdir -p build/clang10-debug-mpi
- cd build/clang10-debug-mpi
- CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
- make pugs
cache:
key: "${CI_COMMIT_REF_SLUG}-clang10-release-seq"
key: "${CI_COMMIT_REF_SLUG}-clang10-debug-mpi"
paths:
- build/clang10-release-seq
- build/clang10-debug-mpi
untracked: true
test:clang10-seq-release:
image: localhost:5000/ubuntu_clang10
test:clang10-mpi-debug:
image: localhost:5000/ubuntu_clang10_mpi
stage: test
dependencies:
- build:clang10-seq-release
needs: ["build:clang10-mpi-debug"]
script:
- mkdir -p build/clang10-release-seq
- cd build/clang10-release-seq
- CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCLANG_FORMAT=/usr/bin/clang-format-10
- mkdir -p build/clang10-debug-mpi
- cd build/clang10-debug-mpi
- CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
- make run_unit_tests
cache:
key: "${CI_COMMIT_REF_SLUG}-clang10-release-seq"
key: "${CI_COMMIT_REF_SLUG}-clang10-debug-mpi"
paths:
- build/clang10-release-seq
- build/clang10-debug-mpi
untracked: true
build:clang10-mpi-release:
image: localhost:5000/ubuntu_clang10_mpi
stage: build
needs: []
script:
- mkdir -p build/clang10-release-mpi
- cd build/clang10-release-mpi
......@@ -15,8 +16,7 @@ build:clang10-mpi-release:
test:clang10-mpi-release:
image: localhost:5000/ubuntu_clang10_mpi
stage: test
dependencies:
- build:clang10-mpi-release
needs: ["build:clang10-mpi-release"]
script:
- mkdir -p build/clang10-release-mpi
- cd build/clang10-release-mpi
......
coverage:clang10-seq-coverage:
image: localhost:5000/ubuntu_clang10
stage: coverage
script:
- mkdir -p build/clang10-cov
- cd build/clang10-cov
- CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage -DCLANG_FORMAT=/usr/bin/clang-format-10
- make pugs
- make coverage
cache:
key: "${CI_COMMIT_REF_SLUG}-clang10-cov"
paths:
- build/clang10-cov
untracked: true
coverage:gcc10-mpi-coverage:
image: localhost:5000/ubuntu_gcc10_mpi
stage: coverage
script:
- mkdir -p build/gcc10-cov-mpi
- cd build/gcc10-cov-mpi
- CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage
- make pugs
- make coverage
cache:
key: "${CI_COMMIT_REF_SLUG}-gcc10-cov-mpi"
paths:
- build/gcc10-cov-mpi
untracked: true
build:gcc10-mpi-debug:
image: localhost:5000/ubuntu_gcc10_mpi
stage: build
needs: []
script:
- mkdir -p build/gcc10-debug-mpi
- cd build/gcc10-debug-mpi
- CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
- make pugs
cache:
key: "${CI_COMMIT_REF_SLUG}-gcc10-debug-mpi"
paths:
- build/gcc10-debug-mpi
untracked: true
test:gcc10-mpi-debug:
image: localhost:5000/ubuntu_gcc10_mpi
stage: test
needs: ["build:gcc10-mpi-debug"]
script:
- mkdir -p build/gcc10-debug-mpi
- cd build/gcc10-debug-mpi
- CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
- make run_unit_tests
cache:
key: "${CI_COMMIT_REF_SLUG}-gcc10-debug-mpi"
paths:
- build/gcc10-debug-mpi
untracked: true
build:gcc10-mpi-release:
image: localhost:5000/ubuntu_gcc10_mpi
stage: build
needs: []
script:
- mkdir -p build/gcc10-release-mpi
- cd build/gcc10-release-mpi
- CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release
- make pugs
cache:
key: "${CI_COMMIT_REF_SLUG}-gcc10-release-mpi"
paths:
- build/gcc10-release-mpi
untracked: true
test:gcc10-mpi-release:
image: localhost:5000/ubuntu_gcc10_mpi
stage: test
needs: ["build:gcc10-mpi-release"]
script:
- mkdir -p build/gcc10-release-mpi
- cd build/gcc10-release-mpi
- CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release
- make run_unit_tests
cache:
key: "${CI_COMMIT_REF_SLUG}-gcc10-release-mpi"
paths:
- build/gcc10-release-mpi
untracked: true
coverage:gcc10-seq-coverage:
image: localhost:5000/ubuntu_gcc10
stage: coverage
script:
- mkdir -p build/gcc10-cov
- cd build/gcc10-cov
- CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage
- make pugs
- make coverage
cache:
key: "${CI_COMMIT_REF_SLUG}-gcc10-cov"
paths:
- build/gcc10-cov
untracked: true
build:gcc10-seq-release:
image: localhost:5000/ubuntu_gcc10
stage: build
needs: []
script:
- mkdir -p build/gcc10-release-seq
- cd build/gcc10-release-seq
- CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release
- make pugs
cache:
key: "${CI_COMMIT_REF_SLUG}-gcc10-release-seq"
paths:
- build/gcc10-release-seq
untracked: true
test:gcc10-seq-release:
image: localhost:5000/ubuntu_gcc10
stage: test
needs: ["build:gcc10-seq-release"]
script:
- mkdir -p build/gcc10-release-seq
- cd build/gcc10-release-seq
- CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Release
- make run_unit_tests
cache:
key: "${CI_COMMIT_REF_SLUG}-gcc10-release-seq"
paths:
- build/gcc10-release-seq
untracked: true
build:gcc8-seq-coverage:
image: localhost:5000/ubuntu_gcc8
stage: coverage
script:
- mkdir -p build/gcc8-seq-covrage
- cd build/gcc8-seq-covrage
- CXX=g++-8 CC=gcc-8 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage
- make coverage
cache:
key: "${CI_COMMIT_REF_SLUG}-gcc8-seq-coverage"
paths:
- build/gcc8-seq-covrage
untracked: true
build:gcc8-seq-dbg:
image: localhost:5000/ubuntu_gcc8
stage: build
script:
- mkdir -p build/gcc8-seq-dbg
- cd build/gcc8-seq-dbg
- CXX=g++-8 CC=gcc-8 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
- make pugs
cache:
key: "${CI_COMMIT_REF_SLUG}-gcc8-seq-dbg"
paths:
- build/gcc8-seq-dbg
untracked: true
test:gcc8-seq-dbg:
image: localhost:5000/ubuntu_gcc8
stage: test
dependencies:
- build:gcc8-seq-dbg
script:
- mkdir -p build/gcc8-seq-dbg
- cd build/gcc8-seq-dbg
- CXX=g++-8 CC=gcc-8 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
- make run_unit_tests
cache:
key: "${CI_COMMIT_REF_SLUG}-gcc8-seq-dbg"
paths:
- build/gcc8-seq-dbg
untracked: true
build:gcc8-seq-release:
image: localhost:5000/ubuntu_gcc8
stage: build
script:
- mkdir -p build/gcc8-seq-release
- cd build/gcc8-seq-release
- CXX=g++-8 CC=gcc-8 cmake ../.. -DCMAKE_BUILD_TYPE=Release
- make pugs
cache:
key: "${CI_COMMIT_REF_SLUG}-gcc8-seq-release"
paths:
- build/gcc8-seq-release
untracked: true
test:gcc8-seq-release:
image: localhost:5000/ubuntu_gcc8
stage: test
dependencies:
- build:gcc8-seq-release
script:
- mkdir -p build/gcc8-seq-release
- cd build/gcc8-seq-release
- CXX=g++-8 CC=gcc-8 cmake ../.. -DCMAKE_BUILD_TYPE=Release
- make run_unit_tests
cache:
key: "${CI_COMMIT_REF_SLUG}-gcc8-seq-release"
paths:
- build/gcc8-seq-release
untracked: true
cmake_minimum_required (VERSION 3.4)
cmake_minimum_required (VERSION 3.10)
# CMake utils
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
......@@ -81,8 +81,8 @@ endif()
#------------------------------------------------------
# Checks if compiler version is compatible with Pugs sources
set(GNU_CXX_MIN_VERSION "7.0.0")
set(CLANG_CXX_MIN_VERSION "5.0.0")
set(GNU_CXX_MIN_VERSION "8.0.0")
set(CLANG_CXX_MIN_VERSION "8.0.0")
# Pugs default compiler flags
set(PUGS_CXX_FLAGS "${PUGS_CXX_FLAGS} -Wall -Wextra -pedantic")
......@@ -181,15 +181,7 @@ endif()
#------------------------------------------------------
# C++ 17 flags
if(${CMAKE_VERSION} VERSION_LESS "3.8.0")
message(WARNING "Please consider to switch to CMake >= 3.8")
set(PUGS_CXX_FLAGS "${PUGS_CXX_FLAGS} -std=gnu++1z")
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
set(PUGS_CXX_FLAGS "${PUGS_CXX_FLAGS} -Wno-c++17-extensions")
endif()
else()
set(CMAKE_CXX_STANDARD "17")
endif()
#------------------------------------------------------
# Kokkos configuration
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment