From 14c86ac141d39afbba2566d5f7e6e5a35aec400c Mon Sep 17 00:00:00 2001
From: adrien-matta <a.matta@surrey.ac.uk>
Date: Wed, 29 Jul 2015 10:44:24 +0100
Subject: [PATCH] * fixing bash in travis
---
.travis.yml | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 339ea9847..29234558a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,18 +4,14 @@ compiler:
- gcc
- clang
-os:
- - linux
- - osx
-
before_install:
# Linux
- - if [ "TRAVIS_OS_NAME" == "linux" ]; sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ trusty main universe"; fi
- - if [ "TRAVIS_OS_NAME" == "linux" ]; sudo apt-get update -qq; fi
- - if [ "TRAVIS_OS_NAME" == "linux" ]; sudo apt-get install root-system -y; fi
+ - if [ "TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu/ trusty main universe"; fi
+ - if [ "TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi
+ - if [ "TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install root-system -y; fi
# OSX
- - if [ "TRAVIS_OS_NAME" == "osx" ]; brew install homebrew/science/root; fi
- - if [ "TRAVIS_OS_NAME" == "osx" ]; brew install homebrew/science/geant4; fi
+ - if [ "TRAVIS_OS_NAME" == "osx" ]; then brew install homebrew/science/root; fi
+ - if [ "TRAVIS_OS_NAME" == "osx" ]; then brew install homebrew/science/geant4; fi
# Dumping stuff for check
- root-config --cflags
@@ -38,4 +34,7 @@ branches:
only:
- NPTool.2.dev
+os:
+ - linux
+ - osx
--
GitLab