diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 226a6b9f277f93cddb1a9b246c1e049f9645d0dd..39f8905b535d1208e6b66891af4e3350fd0cc2fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,54 +7,54 @@ stages: - install - test -env:ubuntu_zesty: - image: keckj/hysop:ubuntu_zesty +env:bionic: + image: keckj/hysop:bionic stage: env script: - "sh ci/scripts/version.sh" -config:ubuntu_zesty: - image: keckj/hysop:ubuntu_zesty +config:bionic: + image: keckj/hysop:bionic stage: configure script: - "sh ci/scripts/config.sh $CI_PROJECT_DIR/build/gcc-6 $CI_PROJECT_DIR/install/gcc-6 gcc-6 g++-6 gfortran-6" - "sh ci/scripts/config.sh $CI_PROJECT_DIR/build/clang-6 $CI_PROJECT_DIR/install/clang-6 clang-6.0 clang++-6.0 gfortran-6" dependencies: - - env:ubuntu_zesty + - env:bionic artifacts: paths: - $CI_PROJECT_DIR/build -build:ubuntu_zesty: - image: keckj/hysop:ubuntu_zesty +build:bionic: + image: keckj/hysop:bionic stage: build script: - "sh ci/scripts/build.sh $CI_PROJECT_DIR/build/gcc-6 gcc-6 g++-6 gfortran-6" - "sh ci/scripts/build.sh $CI_PROJECT_DIR/build/clang-6 clang-6.0 clang++-6.0 gfortran-6" dependencies: - - config:ubuntu_zesty + - config:bionic artifacts: paths: - $CI_PROJECT_DIR/build -install:ubuntu_zesty: - image: keckj/hysop:ubuntu_zesty +install:bionic: + image: keckj/hysop:bionic stage: install script: - "sh ci/scripts/install.sh $CI_PROJECT_DIR/build/gcc-6 $CI_PROJECT_DIR/install/gcc-6" dependencies: - - build:ubuntu_zesty + - build:bionic artifacts: paths: - $CI_PROJECT_DIR/install -test:ubuntu_zesty: - image: keckj/hysop:ubuntu_zesty +test:bionic: + image: keckj/hysop:bionic stage: test script: - "sh ci/scripts/test.sh $CI_PROJECT_DIR/install/gcc-6 $CI_PROJECT_DIR/hysop $CI_PROJECT_DIR/cache" dependencies: - - install:ubuntu_zesty + - install:bionic cache: paths: - $CI_PROJECT_DIR/cache