Merge pull request #588 from kiwix/ubuntu-20.04

Move all our CI to focal instead of bionic

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
           - android_arm64
           - android_x86
           - android_x86_64
-        image_variant: ['bionic']
+        image_variant: ['focal']
         lib_postfix: ['/x86_64-linux-gnu']
         include:
           - target: win32_static
@@ -42,7 +42,7 @@ jobs:
       SSH_KEY: /tmp/id_rsa
     runs-on: ubuntu-latest
     container:
-      image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:36"
+      image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:dev"
       options: "--device /dev/fuse --privileged"
     steps:
     - name: Checkout code

.github/workflows/container_images.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        variant: [bionic, f35, focal, alpine]
+        variant: [f35, focal, alpine]
     runs-on: ubuntu-22.04
 
     steps:

.github/workflows/releaseNigthly.yml

@@ -30,49 +30,49 @@ jobs:
           - android_x86_64
         include:
           - target: native_static
-            image_variant: bionic
+            image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
           - target: native_dyn
-            image_variant: bionic
+            image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
           - target: native_mixed
-            image_variant: bionic
+            image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
           - target: native_desktop
-            image_variant: bionic
+            image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
           - target: wasm
-            image_variant: bionic
+            image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
           - target: armhf_static
-            image_variant: bionic
+            image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
           - target: armhf_mixed
-            image_variant: bionic
+            image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
           - target: aarch64_static
-            image_variant: bionic
+            image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
           - target: aarch64_mixed
-            image_variant: bionic
+            image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
           - target: win32_static
             image_variant: f35
             lib_postfix: '64'
           - target: i586_static
-            image_variant: bionic
+            image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
           - target: android_arm
-            image_variant: bionic
+            image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
           - target: android_arm64
-            image_variant: bionic
+            image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
           - target: android_x86
-            image_variant: bionic
+            image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
           - target: android_x86_64
-            image_variant: bionic
+            image_variant: focal
             lib_postfix: '/x86_64-linux-gnu'
     env:
       HOME: /home/runner

README.md

@@ -4,7 +4,7 @@ Kiwix Build provides advanced tools to (cross-)compile easily
 [Kiwix](https://kiwix.org) & [openZIM](https://openzim.org) softwares
 and libraries and deploy them. They have been tested on
 [Fedora](https://getfedora.org) 35+ & [Ubuntu](https://ubuntu.com)
-18.04+.
+20.04+.
 
 [![Build Status](https://github.com/kiwix/kiwix-build/workflows/CI/badge.svg?query=branch%3Amain)](https://github.com/kiwix/kiwix-build/actions?query=branch%3Amain)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)

ci_images/focal_builder.dockerfile

@@ -9,10 +9,14 @@ RUN apt update -q \
 # 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 libgl-dev \
+# Python (2) is needed to install android-ndk
+    python \
 # Packaged dependencies
     libbz2-dev libmagic-dev uuid-dev zlib1g-dev \
-    libmicrohttpd-dev aria2 libgtest-dev \
+    libmicrohttpd-dev aria2 libgtest-dev libgl-dev \
+# Devel package to compile python modules
+    libxml2-dev libxslt-dev python3-dev \
 # Qt packages
     libqt5gui5 qtbase5-dev qtwebengine5-dev libqt5svg5-dev qt5-image-formats-plugins qt5-default \
 # To create the appimage of kiwix-desktop
@@ -21,6 +25,8 @@ RUN apt update -q \
     elfutils flatpak flatpak-builder \
 # Cross win32 compiler
     g++-mingw-w64-i686 gcc-mingw-w64-i686 gcc-mingw-w64-base mingw-w64-tools \
+# Cross compile i586
+    libc6-dev-i386 lib32stdc++6 gcc-multilib g++-multilib \
 # Other tools (to remove)
 #    vim less grep \
   && apt-get clean -y \
@@ -31,4 +37,4 @@ RUN apt update -q \
 RUN groupadd --gid 121 runner
 RUN useradd --uid 1001 --gid 121 --create-home runner
 USER runner
-ENV PATH /home/runner/.local/bin:$PATH
+ENV PATH /home/runner/.local/bin:$PATH

kiwixbuild/versions.py

@@ -39,7 +39,7 @@ release_versions = {
 
 # This is the "version" of the whole base_deps_versions dict.
 # Change this when you change base_deps_versions.
-base_deps_meta_version = '83'
+base_deps_meta_version = '84'
 
 base_deps_versions = {
   'zlib' : '1.2.12',

scripts/create_kiwix-desktop_appImage.sh

@@ -34,7 +34,7 @@ mkdir -p $APPDIR/etc/ssl/certs/ && tar -C $APPDIR/etc/ssl/certs/ -xf aria2-1.36.
 
 # Get linuxdeployqt
 # Dispite the 'continuous' in the file name, it IS release 8
-wget --continue https://github.com/probonopd/linuxdeployqt/releases/download/8/linuxdeployqt-continuous-x86_64.AppImage -O linuxdeployqt
+wget --continue https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage -O linuxdeployqt
 chmod u+x linuxdeployqt
 
 # Fill with all deps libs and so