From 7764b8ebed52821793c6252428f1f0a8a08f4353 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 14 Oct 2018 13:31:06 +0100
Subject: [PATCH v1] travis: move linux parameters back to toplevel to allow
env combinations to work properly
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index dc9cd8503..ed7d0b150 100644
a
|
b
|
env:
|
9 | 9 | jdk: |
10 | 10 | - openjdk8 |
11 | 11 | - openjdk11 |
| 12 | os: linux |
| 13 | dist: trusty |
12 | 14 | matrix: |
13 | 15 | include: |
14 | | - os: linux |
15 | | dist: trusty |
16 | 16 | - os: osx |
17 | 17 | osx_image: xcode9.3 |
18 | 18 | jdk: ~ |