From abdea2f7f0eb5e8c1a6fee6afcd27bccd7593c97 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Thu, 15 Aug 2019 08:07:42 +0200
Subject: [PATCH 1/2] Travis CI: Switch to installing packages using the APT
 addon

Now that we no longer need to conditionally install a package, we can
use the APT addon for Travis CI to install the required packages.

See:

* https://docs.travis-ci.com/user/installing-dependencies/#installing-packages-with-the-apt-addon
  (Installing Packages with the APT Addon)
---
 .travis.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7ac9b18..44b9365 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,11 @@
 dist: bionic
 language: c
-install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq apache2-dev libglib2.0-dev liblasso3-dev libssl-dev
+addons:
+  apt:
+    packages:
+      - apache2-dev
+      - libglib2.0-dev
+      - liblasso3-dev
+      - libssl-dev
+
 script: ./autogen.sh && ./configure CFLAGS=-Werror && make && make distfile

From 6016d38608a200bfb1eff653efe906b2d3fff355 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Thu, 15 Aug 2019 08:11:54 +0200
Subject: [PATCH 2/2] Travis CI: Make script more readable

Instead of listing all commands to run in a single line, split it into
multiple steps. This makes it easier to read the build script, and
also makes the output more readable.
---
 .travis.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 44b9365..9c0265e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,4 +8,8 @@ addons:
       - liblasso3-dev
       - libssl-dev
 
-script: ./autogen.sh && ./configure CFLAGS=-Werror && make && make distfile
+script:
+  - ./autogen.sh
+  - ./configure CFLAGS=-Werror
+  - make
+  - make distfile