Update ci files

* Removed libquazip-headers from trusty ci images Trusty does not provide libquazip-headers (they are part of libquazip-dev most likely) * Bump rebuild counter
keepassxreboot · Oct 1, 2018 · 28e7540 · 28e7540
1 parent 1a42c58
commit 28e7540
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -53,8 +53,7 @@ RUN set -x \
         zlib1g-dev \
         libxi-dev \
         libxtst-dev \
-	libquazip5-headers \
-	libquazip5-dev \
+        libquazip-dev \
         mesa-common-dev \
         libyubikey-dev \
         libykpers-1-dev

diff --git a/INSTALL.md b/INSTALL.md
@@ -27,6 +27,7 @@ The following libraries are required:
 * libxi, libxtst, qtx11extras (optional for auto-type on X11)
 * libsodium (>= 1.0.12, optional for KeePassXC-Browser support)
 * libargon2
+* libquazip5
 
 Prepare the Building Environment
 ================================

diff --git a/ci/trusty/Dockerfile b/ci/trusty/Dockerfile
@@ -18,7 +18,7 @@
 
 FROM ubuntu:14.04
 
-ENV REBUILD_COUNTER=4
+ENV REBUILD_COUNTER=5
 
 ENV QT5_VERSION=qt53
 ENV QT5_PPA_VERSION=${QT5_VERSION}2
@@ -52,8 +52,7 @@ RUN set -x \
         zlib1g-dev \
         libyubikey-dev \
         libykpers-1-dev \
-        libquazip5-headers \
-        libquazip5-dev \
+        libquazip-dev \
         libxi-dev \
         libxtst-dev \
         xvfb

diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -48,6 +48,8 @@ parts:
       - libykpers-1-dev
       - libsodium-dev
       - libargon2-0-dev
+      - libquazip5-dev
+      - libquazip5-headers
     stage-packages:
       - dbus
       - qttranslations5-l10n # common translations