Merge pull request #446 from kiwix/build_base_deps_bionics

.github/ci_images/bionic_builder.dockerfile

@@ -4,13 +4,16 @@ ENV LANG C.UTF-8
 ENV OS_NAME bionic
 
 RUN apt update -q \
+  && dpkg --add-architecture i386 \
   && apt install -q -y --no-install-recommends \
 # Base build tools
     build-essential automake libtool cmake ccache pkg-config autopoint patch \
     python3-pip python3-setuptools python3-wheel git subversion wget unzip \
-    ninja-build openssh-client \
+    ninja-build openssh-client curl \
+# Python (2) is needed to install android-ndk
+    python \
 # Packaged dependencies
-    libbz2-dev libmagic-dev uuid-dev zlib1g-dev \
+    libbz2-dev libmagic-dev uuid-dev zlib1g-dev default-jdk \
     libmicrohttpd-dev aria2 libgtest-dev \
 # Qt packages
     libqt5gui5 qtbase5-dev qtwebengine5-dev libqt5svg5-dev qt5-image-formats-plugins qt5-default \
@@ -18,8 +21,8 @@ RUN apt update -q \
     libfuse2 fuse patchelf \
 # Flatpak tools
     elfutils flatpak flatpak-builder \
-# Cross win32 compiler
+# Cross compile i586
-    g++-mingw-w64-i686 gcc-mingw-w64-i686 gcc-mingw-w64-base mingw-w64-tools \
+    libc6-dev-i386 lib32stdc++6 gcc-multilib g++-multilib \
 # Other tools (to remove)
 #    vim less grep \
   && apt-get clean -y \

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ on:
    - cron: '0 1 * * *'
 
 env:
-  DOCKER_VERSION: 29
+  DOCKER_VERSION: 30
 
 jobs:
   Docker:
@@ -40,64 +40,33 @@ jobs:
           - native_desktop
           - armhf_static
           - armhf_dyn
-          - win32_static
-          - win32_dyn
           - i586_static
           - i586_dyn
           - android_arm
           - android_arm64
           - android_x86
           - android_x86_64
+        image_variant: ['xenial', 'bionic']
+        lib_postfix: ['/x86_64-linux-gnu']
         include:
-          - target: native_static
-            image_variant: xenial
-            lib_postfix: '/x86_64-linux-gnu'
-          - target: native_dyn
-            image_variant: xenial
-            lib_postfix: '/x86_64-linux-gnu'
-          - target: native_mixed
-            image_variant: xenial
-            lib_postfix: '/x86_64-linux-gnu'
-          - target: native_desktop
-            image_variant: bionic
-            lib_postfix: '/x86_64-linux-gnu'
-          - target: armhf_static
-            image_variant: xenial
-            lib_postfix: '/x86_64-linux-gnu'
-          - target: armhf_dyn
-            image_variant: xenial
-            lib_postfix: '/x86_64-linux-gnu'
           - target: win32_static
             image_variant: f31
             lib_postfix: '64'
           - target: win32_dyn
             image_variant: f31
             lib_postfix: '64'
-          - target: i586_static
+        exclude:
+          - target: native_desktop
             image_variant: xenial
-            lib_postfix: '/x86_64-linux-gnu'
+          - target: native_static
-          - target: i586_dyn
+            image_variant: bionic
-            image_variant: xenial
-            lib_postfix: '/x86_64-linux-gnu'
-          - target: android_arm
-            image_variant: xenial
-            lib_postfix: '/x86_64-linux-gnu'
-          - target: android_arm64
-            image_variant: xenial
-            lib_postfix: '/x86_64-linux-gnu'
-          - target: android_x86
-            image_variant: xenial
-            lib_postfix: '/x86_64-linux-gnu'
-          - target: android_x86_64
-            image_variant: xenial
-            lib_postfix: '/x86_64-linux-gnu'
     env:
       HOME: /home/runner
       SSH_KEY: /tmp/id_rsa
     runs-on: ubuntu-latest
     needs: Docker
     container:
-      image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-29"
+      image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-30"
     steps:
     - name: Checkout code
       shell: bash

.github/workflows/releaseNigthly.yml

@@ -8,7 +8,7 @@ on:
    - cron: '0 1 * * *'
 
 env:
-  DOCKER_VERSION: 29
+  DOCKER_VERSION: 30
 
 jobs:
   Docker:
@@ -79,7 +79,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: Docker
     container:
-      image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-29"
+      image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-30"
       options: "--device /dev/fuse --privileged"
     steps:
     - name: Checkout code

kiwixbuild/versions.py

@@ -3,7 +3,7 @@
 main_project_versions = {
     'kiwix-lib': '9.2.2',
     'kiwix-tools': '3.1.1', # Also need to change this in appveyor/install_kiwix-tools.cmd
-    'libzim': '6.1.4',
+    'libzim': '6.1.5',
     'zim-tools': '1.2.1',
     'zimwriterfs': '1.3.10',
     'kiwix-desktop': '2.0.1' # Also change KIWIX_DESKTOP_VERSION and KIWIX_DESKTOP_RELEASE in appveyor.yml
@@ -31,9 +31,9 @@ main_project_versions = {
 # - set KIWIX_DESKTOP_RELEASE to 0
 
 release_versions = {
-    'libzim': None, # Depends of base deps (was 0)
+    'libzim': 0, # Depends of base deps (was 0)
-    'kiwix-lib': 0, # Depends of libzim (was 0)
+    'kiwix-lib': None, # Depends of libzim (was 0)
-    'kiwix-tools': 4, # Depends of kiwix-lib and libzim (was 3)
+    'kiwix-tools': None, # Depends of kiwix-lib and libzim (was 4)
     'zim-tools': None, # Depends of libzim (was 1)
     'zimwriterfs': None, # Depends of libzim (was 2)
     'kiwix-desktop': None # Depends of kiwix-lib and libzim (was 0)