From e342c9791f1855c433a705fb1026464a5435c9c2 Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Tue, 18 Aug 2020 21:56:36 +0200
Subject: [PATCH] Update .travis.yml and preinstall.sh

---
 .travis.yml          | 5 ++---
 travis/preinstall.sh | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 travis/preinstall.sh

diff --git a/.travis.yml b/.travis.yml
index 2070817..c87e9a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ arch:
 osx_image: xcode10.1
 dist: bionic
 before_install:
-  - sudo apt-get -y install make git zlib1g-dev libssl-dev gperf php cmake openjdk-11-jdk-headless g++ ccache maven
+  - bash travis/preinstall.sh
   - cp .travis.settings.xml $HOME/.m2/settings.xml
 addons:
   apt:
@@ -38,8 +38,7 @@ deploy:
 
 script: |
   if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 
-    bash -e travis/linux.sh; 
-    bash -e travis/deploy_master.sh
+    bash -e travis/linux.sh && bash -e travis/deploy_master.sh
   fi
   
   if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then 
diff --git a/travis/preinstall.sh b/travis/preinstall.sh
new file mode 100644
index 0000000..d1a4a6a
--- /dev/null
+++ b/travis/preinstall.sh
@@ -0,0 +1,4 @@
+#!/bin/bash -e 
+if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+    sudo apt-get -y install make git zlib1g-dev libssl-dev gperf php cmake openjdk-11-jdk-headless g++ ccache maven
+fi