58 lines
1.6 KiB
Diff
58 lines
1.6 KiB
Diff
|
From 3d0272265e89adfcc790d697d07cbc42be1b7b2e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Robbie Harwood <rharwood@redhat.com>
|
||
|
|
Date: Wed, 2 Aug 2017 18:48:02 -0400
|
||
|
|
Subject: [PATCH] Add a CI target for clang
|
||
|
|
|
||
|
|
(cherry picked from commit b1cb74d3db1f6377508282d0d98e197b5c654295)
|
||
|
|
---
|
||
|
|
.travis.sh | 6 +++---
|
||
|
|
.travis.yml | 8 +++++---
|
||
|
|
2 files changed, 8 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/.travis.sh b/.travis.sh
|
||
|
|
index e404e9a..3be21ac 100755
|
||
|
|
--- a/.travis.sh
|
||
|
|
+++ b/.travis.sh
|
||
|
|
@@ -2,15 +2,15 @@
|
||
|
|
|
||
|
|
if [ -f /etc/debian_version ]; then
|
||
|
|
apt-get update
|
||
|
|
- apt-get -y install autoconf build-essential libtool \
|
||
|
|
+ apt-get -y install autoconf build-essential libtool $CC \
|
||
|
|
lib{ev,event,glib2.0}-dev
|
||
|
|
elif [ -f /etc/fedora-release ]; then
|
||
|
|
# dnf has no update-only verb
|
||
|
|
- dnf -y install autoconf automake libtool make \
|
||
|
|
+ dnf -y install autoconf automake libtool make $CC \
|
||
|
|
{glib2,libevent,libev}-devel
|
||
|
|
elif [ -f /etc/redhat-release ]; then
|
||
|
|
# rhel/centos
|
||
|
|
- yum -y install autoconf automake libtool make \
|
||
|
|
+ yum -y install autoconf automake libtool make $CC \
|
||
|
|
{glib2,libevent}-devel
|
||
|
|
else
|
||
|
|
echo "Distro not found!"
|
||
|
|
diff --git a/.travis.yml b/.travis.yml
|
||
|
|
index 4c63f28..0def685 100644
|
||
|
|
--- a/.travis.yml
|
||
|
|
+++ b/.travis.yml
|
||
|
|
@@ -7,13 +7,15 @@ services:
|
||
|
|
- docker
|
||
|
|
|
||
|
|
env:
|
||
|
|
- - DISTRO=debian:sid
|
||
|
|
- - DISTRO=fedora:rawhide
|
||
|
|
- - DISTRO=centos:7
|
||
|
|
+ - DISTRO=debian:sid CC=gcc
|
||
|
|
+ - DISTRO=fedora:rawhide CC=gcc
|
||
|
|
+ - DISTRO=fedora:rawhide CC=clang
|
||
|
|
+ - DISTRO=centos:7 CC=gcc
|
||
|
|
|
||
|
|
script:
|
||
|
|
- >
|
||
|
|
docker run
|
||
|
|
-v `pwd`:/tmp/build
|
||
|
|
-w /tmp/build
|
||
|
|
+ -e CC=$CC
|
||
|
|
$DISTRO /bin/bash -ex .travis.sh
|