diff --git a/.travis.yml b/.travis.yml index 5239ad95..0de816a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ jobs: include: - stage: "Build Sarus and Test" name: "Version and Docs" - if: branch IN (master, develop) + if: branch IN (master, develop, fix-travis) script: - . CI/utility_docker_functions.bash - sarus-build-images @@ -38,39 +38,31 @@ jobs: branch: master - name: "Test install from source CentOS 7" - if: branch IN (master, develop) + if: branch IN (master, develop, fix-travis) script: - . ./CI/utility_docker_functions.bash Release gcc.cmake $(pwd) $(pwd)/cache centos:7 centos:7 - sarus-build-images - - sarus-build-from-scratch-and-test + - travis_wait 60 sarus-build-from-scratch-and-test - name: "Test install from source Ubuntu 18.04" - if: branch IN (master, develop) + if: branch IN (master, develop, fix-travis) script: - . ./CI/utility_docker_functions.bash Release gcc.cmake $(pwd) $(pwd)/cache ubuntu:18.04 ubuntu:18.04 - sarus-build-images - sarus-build-from-scratch-and-test - - name: "Test install from source Debian 10" - if: branch IN (master, develop) - script: - - . ./CI/utility_docker_functions.bash Release gcc.cmake $(pwd) $(pwd)/cache debian:10 debian:10 - - sarus-build-images - - sarus-build-from-scratch-and-test - - name: "Test install from source Debian 10 with AddressSanitizer" - if: branch IN (master, develop) + if: branch IN (master, develop, fix-travis) script: - . ./CI/utility_docker_functions.bash Debug gcc-asan.cmake $(pwd) $(pwd)/cache debian:10 debian:10 - sarus-build-images - - sarus-build-from-scratch-and-test + - travis_wait 60 sarus-build-from-scratch-and-test - name: "Test Spack" - if: branch IN (master, develop) + if: branch IN (master, develop, fix-travis) script: - docker_image=ethcscs/sarus-spack:1.1.0-ubuntu16.04 - - sarus-build-images - - docker run --tty --rm --privileged --user root -v $(pwd):/sarus-source ${docker_image} /sarus-source/CI/run_spack_package_test.sh + - travis_wait 60 docker run --tty --rm --privileged --user root -v $(pwd):/sarus-source ${docker_image} /sarus-source/CI/run_spack_package_test.sh notifications: email: diff --git a/CHANGELOG.md b/CHANGELOG.md index ab9eb977..dac9dfef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). -## [1.2.0] + +## [1.2.0] - 2020-06-17 ### Added