From 67f9cfca318cb6f56b63a23443a5c6bb9f8c480d Mon Sep 17 00:00:00 2001
From: Sebastian Eibl <sebastian.eibl@fau.de>
Date: Wed, 7 Nov 2018 13:35:19 +0100
Subject: [PATCH] updated benchmark compilers and removed clang tidy from
benchmarks
---
.gitlab-ci.yml | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94c0b5eae..0f1819521 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1519,6 +1519,9 @@ clang-tidy:
- cmake . -LAH
- utilities/filterCompileCommands.py compile_commands.json
- run-clang-tidy.py -quiet | tee clang-tidy-output.txt
+ except:
+ variables:
+ - $DISABLE_PER_COMMIT_BUILDS
artifacts:
paths:
- $CI_PROJECT_DIR/build/clang-tidy-output.txt
@@ -1962,14 +1965,14 @@ conda-py35-linux:
- $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_HCSITS_NN_IGMDC.txt
- $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_HCSITS_SO_IFC.txt
-benchmark_intel17:
+benchmark_intel19:
<<: *benchmark_definition
- image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
benchmark_gcc7:
<<: *benchmark_definition
image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
-benchmark_clang6:
+benchmark_clang7:
<<: *benchmark_definition
- image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
\ No newline at end of file
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
\ No newline at end of file
--
GitLab