rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-15 12:50:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

travis: remove no longer needed Trusty install scripts

Browse Source 
This also removes all remaining references to LLVM repos, as such
closes https://github.com/rsyslog/rsyslog/issues/2380
This commit is contained in:
Rainer Gerhards 2019-11-14 15:36:51 +01:00
parent c94bf9f5eb
commit 1b2769f5ec
No known key found for this signature in database
GPG Key ID: 0CB6B2A8BE80B499
2 changed files with 4 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -57,7 +57,6 @@ matrix:
- os: linux
compiler: "clang"
dist: trusty
services:
- mysql
- postgresql
@ -66,7 +65,6 @@ matrix:
- os: linux
compiler: "clang"
# we run this test without assert() enabled, so that we get "production timing"
dist: trusty
services:
- mysql
- postgresql
@ -77,8 +75,7 @@ matrix:
services:
- mysql
- postgresql
env: RUN="run.sh",BUILD_FROM_TARBALL="YES", GROK="YES", CHECK="YES", CFLAGS="-g -O2", RS_TESTBENCH_VALGRIND_EXTRA_OPTS="--suppressions=travis/trusty.supp --gen-suppressions=all", EXTRA_CONFIGURE="--disable-default-tests --disable-elasticsearch --disable-impstats --disable-imfile --disable-imptcp --disable-gnutls -disable-openssl --disable-relp --disable-pmsnare --disable-pmlastmsg"
dist: trusty
env: RUN="run.sh",BUILD_FROM_TARBALL="YES", GROK="YES", CHECK="YES", CFLAGS="-g -O2", RS_TESTBENCH_VALGRIND_EXTRA_OPTS="--gen-suppressions=all", EXTRA_CONFIGURE="--disable-default-tests --disable-elasticsearch --disable-impstats --disable-imfile --disable-imptcp --disable-gnutls -disable-openssl --disable-relp --disable-pmsnare --disable-pmlastmsg"
# - os: linux
# compiler: "gcc"
@ -95,7 +92,6 @@ matrix:
- os: linux
# CRON/Coverity entry!
compiler: "gcc"
dist: trusty
env: RUN="run-cron.sh",DO_COVERITY="YES",DO_CRON="YES", KAFKA="YES", GROK="YES"

42
tests/travis/install.sh
View File

@ -32,30 +32,7 @@ sudo apt-get install -qq --force-yes libestr-dev librelp-dev libfastjson-dev lib
libcurl4-openssl-dev
sudo apt-get install -qq python-docutils
if [ "$DISTRIB_CODENAME" == "trusty" ] || [ "$DISTRIB_CODENAME" == "precise" ]; then
WANT_MAXMIND=1.2.0
curl -Ls https://github.com/maxmind/libmaxminddb/releases/download/${WANT_MAXMIND}/libmaxminddb-${WANT_MAXMIND}.tar.gz | tar -xz
(cd libmaxminddb-${WANT_MAXMIND} ; ./configure --prefix=/usr CC=gcc CFLAGS="-Wall -Wextra -g -pipe -std=gnu99" > /dev/null ; make -j2 &>/dev/null ; sudo make install > /dev/null)
rm -rf libmaxminddb-${WANT_MAXMIND} # get rid of source, e.g. for line length check
SAVE_CFLAGS=$CFLAGS
CFLAGS=""
SAVE_CC=$CC
CC="gcc"
sudo apt-get install -qq libssl-dev libsasl2-dev
wget --no-verbose https://github.com/mongodb/mongo-c-driver/releases/download/1.8.1/mongo-c-driver-1.8.1.tar.gz
tar -xzf mongo-c-driver-1.8.1.tar.gz
cd mongo-c-driver-1.8.1/
./configure --enable-ssl --disable-automatic-init-and-cleanup > /dev/null
make -j > /dev/null
sudo make install > /dev/null
cd -
rm -rf mongo-c-driver-1.8.1
CC=$SAVE_CC
CFLAGS=$SAVE_CFLAGS
else
sudo apt-get install -qq libmaxminddb-dev libmongoc-dev libbson-dev
fi
sudo apt-get install -qq libmaxminddb-dev libmongoc-dev libbson-dev
# As travis has no xenial images, we always need to install librdkafka from source
if [ "x$KAFKA" == "xYES" ]; then
@ -77,25 +54,10 @@ fi
sudo apt-get install -qq libhiredis-dev # somehow we now need this
if [ "x$ESTEST" == "xYES" ]; then sudo apt-get install -qq elasticsearch ; fi
if [ "$DISTRIB_CODENAME" == "trusty" ]; then sudo apt-get install -qq libhiredis-dev; export HIREDIS_OPT="--enable-omhiredis"; fi
if [ "$DISTRIB_CODENAME" == "trusty" ]; then sudo apt-get install -qq libsystemd-journal-dev; export JOURNAL_OPT="--enable-imjournal --enable-omjournal"; fi
if [ "$DISTRIB_CODENAME" == "trusty" ] || [ "$DISTRIB_CODENAME" == "precise" ]; then
export IMDOCKER_OPT=
else
if [ "x$IMDOKER" == "xYES" ]; then
# git clone https://github.com/curl/curl.git > /dev/null
# (cd curl; ./buildconf; ./configure; make -j2 > /dev/null; sudo make install > /dev/null;)
if [ "x$IMDOKER" == "xYES" ]; then
export IMDOCKER_OPT="--enable-imdocker --enable-imdocker-tests";
fi
fi
if [ "$DISTRIB_CODENAME" == "trusty" ]; then sudo apt-get install -qq --force-yes libqpid-proton3-dev ;fi
if [ "$CC" == "clang" ] && [ "$DISTRIB_CODENAME" == "trusty" ]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
sudo bash -c "echo \"deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main\" > /etc/apt/sources.list.d/llvm.list" &&\
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - &&\
sudo apt-get update -yy &&\
sudo apt-get install clang-5.0 clang-tools-5.0; fi
if [ "$CC" == "clang" ] && [ "$DISTRIB_CODENAME" == "trusty" ]; then export CLANG_PKG="clang-5.0"; export SCAN_BUILD="scan-build-5.0"; else export CLANG_PKG="clang"; export SCAN_BUILD="scan-build"; fi
if [ "$CC" == "clang" ]; then export NO_VALGRIND="--without-valgrind-testbench"; fi
if [ "$CC" == "clang" ]; then sudo apt-get install -qq $CLANG_PKG ; fi