From d7eaf1be8471934f0ca431d329dd7fa0e7909480 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Fri, 17 Apr 2020 10:02:20 -0400 Subject: [PATCH] make ubuntu1804_gcc6 run for each merge request and not just nightly --- .gitlab/ci/ubuntu1804.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab/ci/ubuntu1804.yml b/.gitlab/ci/ubuntu1804.yml index 5a23fd514..eea36ba8c 100644 --- a/.gitlab/ci/ubuntu1804.yml +++ b/.gitlab/ci/ubuntu1804.yml @@ -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