From 2f6458dd4177e5478986b454ae02ef2e864ea509 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Tue, 7 Jul 2020 22:27:47 +0200
Subject: [PATCH] new travis

---
 .travis.yml                  | 13 ++++++++++---
 docker/main/Dockerfile.evhtp |  1 -
 test/travis/build_evhtp.sh   |  5 +++++
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100755 test/travis/build_evhtp.sh

diff --git a/.travis.yml b/.travis.yml
index f8136a7a..f40d22f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,15 @@ branches:
 language: c
 os: linux
 arch: amd64
-before_script:
+jobs
+- script: ./configure --with-restconf=fcgi && make && sudo make install
+  before_script:
   - sudo apt-get install -y libfcgi-dev
   - ./test/travis/before_script.sh
-script:
-  - ./configure --with-restconf=evhtp && make && sudo make install
+
+jobs
+- script: ./configure --with-restconf=evhtp && make && sudo make install
+  before_script:
+  - sudo apt-get install -y libevent libevent-dev cmake
+  - ./test/travis/before_script.sh
+  - ./test/travis/build_evhtp.sh
diff --git a/docker/main/Dockerfile.evhtp b/docker/main/Dockerfile.evhtp
index 3a316667..84905da8 100644
--- a/docker/main/Dockerfile.evhtp
+++ b/docker/main/Dockerfile.evhtp
@@ -129,7 +129,6 @@ RUN adduser www-data clicon
 
 COPY --from=0 /clixon/build/ /usr/local/
 COPY --from=0 /www-data /www-data
-#COPY --from=0 /usr/local/lib/libevhtp.a /usr/local/lib/libevhtp.a # maybe not necessary since static
 
 # Manually created
 RUN chown www-data /www-data
diff --git a/test/travis/build_evhtp.sh b/test/travis/build_evhtp.sh
new file mode 100755
index 00000000..2e81fb28
--- /dev/null
+++ b/test/travis/build_evhtp.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+# Travis pre-config script.
+# build libevhtp
+git clone https://github.com/criticalstack/libevhtp.git
+(cd libevhtp/build && cmake -DEVHTP_DISABLE_REGEX=ON -DEVHTP_DISABLE_EVTHR=ON .. && make && sudo make install)