Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'add_another_openmp_ci_builder'

Browse Source 
d7eaf1be8 make ubuntu1804_gcc6 run for each merge request and not just nightly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2050
This commit is contained in:
Robert Maynard 2020-04-17 15:04:58 +00:00 committed by Kitware Robot
commit e28b80649e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab/ci/ubuntu1804.yml
View File

@ -113,7 +113,6 @@ test:ubuntu1804_gcc7_2:
# Build on ubuntu1804 with OpenMP and test on ubuntu1804
# Uses gcc 6.5
# Runs only on nightlies
build:ubuntu1804_gcc6:
tags:
- build
@ -123,7 +122,7 @@ build:ubuntu1804_gcc6:
extends:
- .ubuntu1804
- .cmake_build_linux
- .only-master
- .only-default
variables:
CC: "gcc-6"
CXX: "g++-6"
@ -138,7 +137,7 @@ test:ubuntu1804_gcc6:
extends:
- .ubuntu1804
- .cmake_test_linux
- .only-master
- .only-default
variables:
#Restrict OpenMP number of threads since multiple test stages
#execute on the same hardware concurrently