From a00636e35559561663888d533cd3ffd4022749ec Mon Sep 17 00:00:00 2001 From: Alex Dadgar Date: Wed, 18 Oct 2017 21:55:07 -0700 Subject: [PATCH] travis --- .travis.yml | 26 +++++++++++++++----------- scripts/travis-linux.sh | 8 ++++++++ scripts/travis-mac.sh | 5 +++++ 3 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 scripts/travis-linux.sh create mode 100755 scripts/travis-mac.sh diff --git a/.travis.yml b/.travis.yml index 1411e1df5..dc17ffa41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,3 @@ -sudo: required -dist: trusty - services: - docker @@ -18,20 +15,27 @@ branches: matrix: include: - - env: - - env: RUN_UI_TESTS=1 SKIP_NOMAD_TESTS=1 + +matrix: + include: + - os: linux + dist: trusty + sudo: required + - os: linux + dist: trusty + sudo: required + env: RUN_UI_TESTS=1 SKIP_NOMAD_TESTS=1 + - os: osx + osx_image: xcode9.1 + cache: directories: - ui/node_modules before_install: - - sudo apt-get update - - sudo apt-get install -y liblxc1 lxc-dev lxc shellcheck - - sudo apt-get install -y qemu - - sudo bash ./scripts/travis-rkt.sh - - sudo bash ./scripts/travis-consul.sh - - sudo bash ./scripts/travis-vault.sh + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo bash ./scripts/travis-mac.sh ; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo bash ./scripts/travis-linux.sh ; fi install: - make bootstrap diff --git a/scripts/travis-linux.sh b/scripts/travis-linux.sh new file mode 100644 index 000000000..4687cc7ab --- /dev/null +++ b/scripts/travis-linux.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +apt-get update +apt-get install -y liblxc1 lxc-dev lxc shellcheck +apt-get install -y qemu +bash ./scripts/travis-rkt.sh +bash ./scripts/travis-consul.sh +bash ./scripts/travis-vault.sh diff --git a/scripts/travis-mac.sh b/scripts/travis-mac.sh new file mode 100755 index 000000000..76e2fef6f --- /dev/null +++ b/scripts/travis-mac.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +brew upgrade golang +bash ./scripts/travis-consul.sh +bash ./scripts/travis-vault.sh