From 60939fbd32c8bc841ac910789c83bddf91917821 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Keck <jean-baptiste.keck@imag.fr>
Date: Wed, 12 Jun 2019 23:50:26 +0200
Subject: [PATCH] fix compiler versions
---
.gitlab-ci.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 70ababc9c..8c3a25250 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,8 +17,8 @@ config:bionic:
image: keckj/hysop:ubuntu_disco
stage: configure
script:
- - "bash ci/scripts/config.sh $CI_PROJECT_DIR/build/gcc-7 $CI_PROJECT_DIR/install/gcc-7 gcc-7 g++-7 gfortran-7"
- - "bash ci/scripts/config.sh $CI_PROJECT_DIR/build/clang-6 $CI_PROJECT_DIR/install/clang-6 clang-6.0 clang++-6.0 gfortran-7"
+ - "bash ci/scripts/config.sh $CI_PROJECT_DIR/build/gcc-8 $CI_PROJECT_DIR/install/gcc-8 gcc-8 g++-8 gfortran-8"
+ - "bash ci/scripts/config.sh $CI_PROJECT_DIR/build/clang-6 $CI_PROJECT_DIR/install/clang-8 clang-8 clang++-8 gfortran-8"
dependencies:
- env:bionic
artifacts:
@@ -29,8 +29,8 @@ build:bionic:
image: keckj/hysop:ubuntu_disco
stage: build
script:
- - "bash ci/scripts/build.sh $CI_PROJECT_DIR/build/gcc-7 gcc-7 g++-7 gfortran-7"
- - "bash ci/scripts/build.sh $CI_PROJECT_DIR/build/clang-6 clang-6.0 clang++-6.0 gfortran-7"
+ - "bash ci/scripts/build.sh $CI_PROJECT_DIR/build/gcc-8 gcc-8 g++-8 gfortran-8"
+ - "bash ci/scripts/build.sh $CI_PROJECT_DIR/build/clang-8 clang-8 clang++-8 gfortran-8"
dependencies:
- config:bionic
artifacts:
@@ -41,7 +41,7 @@ install:bionic:
image: keckj/hysop:ubuntu_disco
stage: install
script:
- - "bash ci/scripts/install.sh $CI_PROJECT_DIR/build/gcc-7 $CI_PROJECT_DIR/install/gcc-7"
+ - "bash ci/scripts/install.sh $CI_PROJECT_DIR/build/gcc-8 $CI_PROJECT_DIR/install/gcc-8"
dependencies:
- build:bionic
artifacts:
@@ -52,7 +52,7 @@ test:bionic:
image: keckj/hysop:ubuntu_disco
stage: test
script:
- - "bash ci/scripts/test.sh $CI_PROJECT_DIR/install/gcc-7 $CI_PROJECT_DIR/hysop $CI_PROJECT_DIR/cache"
+ - "bash ci/scripts/test.sh $CI_PROJECT_DIR/install/gcc-8 $CI_PROJECT_DIR/hysop $CI_PROJECT_DIR/cache"
dependencies:
- install:bionic
cache:
--
GitLab