You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
25 lines
930 B
25 lines
930 B
2 years ago
|
From a7f87d13f6f7dd92e1f1f7617df531fa34c70b6d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Frantisek Sumsal <fsumsal@redhat.com>
|
||
|
|
Date: Tue, 15 Jan 2019 14:35:27 +0100
|
||
|
|
Subject: [PATCH] travis: fix syntax error in .travis.yml
|
||
|
|
|
||
|
|
(cherry picked from commit 7f9d44f527ea214347f7d3b3b067f84df53feed7)
|
||
|
|
---
|
||
|
|
.travis.yml | 3 +--
|
||
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/.travis.yml b/.travis.yml
|
||
|
|
index 1c4e6f9728..c5c9c345a9 100644
|
||
|
|
--- a/.travis.yml
|
||
|
|
+++ b/.travis.yml
|
||
|
|
@@ -19,8 +19,7 @@ jobs:
|
||
|
|
- sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
|
||
|
|
- docker --version
|
||
|
|
install:
|
||
|
|
- - RHEL_VERSION="rhel7"
|
||
|
|
- - [ -f meson.build ] && RHEL_VERSION="rhel8"
|
||
|
|
+ - if [ -f meson.build ]; then RHEL_VERSION=rhel8; else RHEL_VERSION=rhel7; fi
|
||
|
|
- $CI_ROOT/travis-centos-${RHEL_VERSION}.sh SETUP
|
||
|
|
script:
|
||
|
|
- set -e
|