Fix merge conflict from PGPROEE9_6

vbwagner · vbwagner · commit 5df22d72bf41 · 2016-12-02T09:46:28.000+03:00
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -15,12 +15,9 @@ test:ubuntu-16.04:
   only:
     - PGPROEE9_6
   before_script:
-    - apt-get update && apt-get install -y sudo gcc make flex bison libreadline-dev zlib1g-dev openjade libzstd0 libzstd-dev opensp docbook-xml docbook-xsl docbook
+    - apt-get update && apt-get install -y sudo gcc make flex bison libreadline-dev zlib1g-dev openjade libzstd-dev opensp docbook docbook-xml docbook-xsl libxml2-utils xsltproc python-dev libicu-dev
   script:
-    - ./configure --prefix=/opt/pgproee
+    - ./configure --prefix=/opt/pgproee  --with-zstd --with-icu --with-python
     - make -j $CORES world
-    - sudo make install-world
-    - make check
-    - cd contrib
-    - make check
+    - make check-world
   when: always
