From f1373935ad3afe48bba21c43c4c1394babbd5d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Schw=C3=B6rer?= Date: Tue, 2 Jun 2020 13:16:56 +0100 Subject: [PATCH 1/3] Reduced depencies in test --- scripts/travis_fedora.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/travis_fedora.sh b/scripts/travis_fedora.sh index 0bfa5736c..ccc7561a8 100755 --- a/scripts/travis_fedora.sh +++ b/scripts/travis_fedora.sh @@ -27,6 +27,9 @@ test . != ".$1" && mpi="$1" || mpi=openmpi ## If we are called as root, setup everything if [ $UID -eq 0 ] then + cat /etc/os-release + # Ignore weak depencies + echo "install_weak_deps=False" >> /etc/dnf/dnf.conf time dnf -y upgrade time dnf -y install environment-modules git \ gfortran openblas-devel cmake ${mpi}-devel make gcc-c++ From d3e7f0dab890ce4f11ed5b3e32f86b38a35f1b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Schw=C3=B6rer?= Date: Tue, 2 Jun 2020 13:17:09 +0100 Subject: [PATCH 2/3] Show names in travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index a88adf57d..9b5ebd63d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -278,11 +278,13 @@ jobs: sudo docker start -a mobydick # fedora (released fedora with openmpi) - stage: fedora + name: "Fedora latest with openmpi" dist: xenial script: ./scripts/travis_fedora.sh setup openmpi latest # fedora (with gcc 10 and mpich) - stage: fedora + name: "Fedora rawhide with mpich" dist: xenial script: ./scripts/travis_fedora.sh setup mpich rawhide From bb9f75a637b624625d0e44f29cea9e94f9c289c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Schw=C3=B6rer?= Date: Mon, 8 Jun 2020 09:46:31 +0200 Subject: [PATCH 3/3] Fix bad merge --- .travis.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2a664ef74..defc1bc1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,12 +42,15 @@ jobs: include: # fedora (released fedora with openmpi) - stage: fedora + name: "Fedora latest with openmpi" dist: bionic script: ./scripts/travis_fedora.sh setup openmpi latest # fedora (with gcc 10 and mpich) - stage: fedora + name: "Fedora rawhide with mpich" dist: bionic script: ./scripts/travis_fedora.sh setup mpich rawhide + # osx <=> macOS 10.13 (high sierra) - stage: osx os: osx @@ -225,17 +228,6 @@ jobs: sudo docker cp -a ${TRAVIS_BUILD_DIR} mobydick:/tmp \ && \ sudo docker start -a mobydick - # fedora (released fedora with openmpi) - - stage: fedora - name: "Fedora latest with openmpi" - dist: xenial - script: ./scripts/travis_fedora.sh setup openmpi latest - - # fedora (with gcc 10 and mpich) - - stage: fedora - name: "Fedora rawhide with mpich" - dist: xenial - script: ./scripts/travis_fedora.sh setup mpich rawhide after_failure: