From 3ae5b32aaa291da6cdcfa7ccb19fdc830bc956d1 Mon Sep 17 00:00:00 2001
From: Taylor Yu <catalyst@torproject.org>
Date: Wed, 4 Oct 2017 09:45:21 -0500
Subject: [PATCH] Match .travis.yml more closely

Adjust the GitLab CI configuration to more closely match that of
Travis CI. Fixes bug 23757.
---
 .gitlab-ci.yml   | 16 ++++++++++------
 changes/bug23757 |  4 ++++
 2 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 changes/bug23757

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 969646b98..ba981d5f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,13 +1,17 @@
 before_script:
-    - "apt-get update -qq"
-    - "apt-get upgrade -y"
+    - apt-get update -qq
+    - apt-get upgrade -qy
 
 build:
   script:
-    - "apt-get install -y --fix-missing git openssh-client asciidoc wget gcc g++ automake cmake make libglib2.0 libglib2.0-dev libigraph0 libigraph0-dev libevent-dev openssl libssl-dev"
-    - "sh autogen.sh && ./configure && make"
-    - "make check"
-    - "make install"
+    - apt-get install -qy --fix-missing automake build-essential
+      libevent-dev libssl-dev zlib1g-dev
+      libseccomp-dev liblzma-dev libscrypt-dev
+    - ./autogen.sh
+    - ./configure --disable-asciidoc --enable-fatal-warnings
+      --disable-silent-rules
+    - make check || (e=$?; cat test-suite.log; exit $e)
+    - make install
 
 update:
   only:
diff --git a/changes/bug23757 b/changes/bug23757
new file mode 100644
index 000000000..02507a0b4
--- /dev/null
+++ b/changes/bug23757
@@ -0,0 +1,4 @@
+  o Minor bugfixes (testing):
+    - Adjust the GitLab CI configuration to more closely match that of Travis
+      CI. Fixes bug 23757; bugfix on 0.3.2.2-alpha.
+