summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorIlya Maximets <i.maximets@ovn.org>2020-08-26 18:43:44 +0200
committerIlya Maximets <i.maximets@ovn.org>2020-08-26 21:23:41 +0200
commit11bbae97718c7daab934ecf62fdbd49914f7ebf0 (patch)
tree64990022470fb3d5756e104cd5d9982ee4cd508e /.travis.yml
parent6a328b6e24d43073316d2bc1b29fb87c9eacc85c (diff)
downloadopenvswitch-11bbae97718c7daab934ecf62fdbd49914f7ebf0.tar.gz
travis: Merge matrix entries.
It's not possible to use 'matrix' twice. This makes travis to use the latest one dropping all the osx and arm64 jobs. Fixes: 00d3374d8d54 ("travis: Test build of debian packages.") Acked-by: Aaron Conole <aconole@redhat.com> Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml3
1 files changed, 0 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index b5eaaaea2..43e6a75cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,9 +66,6 @@ matrix:
- arch: arm64
compiler: clang
env: OPTS="--disable-ssl"
-
-matrix:
- include:
- env: DEB_PACKAGE=1
addons:
apt: