From c9e9c5c070b3d9ed3be6cef02b8acf016ebd6a41 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 5 Apr 2023 15:03:35 +0200
Subject: [PATCH] =?UTF-8?q?Move=20all=20our=20CI=C2=A0to=20focal=20instead?=
 =?UTF-8?q?=20of=20bionic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bionic is EOL.
---
 .github/workflows/ci.yml               |  2 +-
 .github/workflows/container_images.yml |  2 +-
 .github/workflows/releaseNigthly.yml   | 28 +++++++++++++-------------
 ci_images/focal_builder.dockerfile     | 12 ++++++++---
 kiwixbuild/versions.py                 |  2 +-
 5 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3550080..a60f47f 100644
--- a/.github/workflows/ci.yml
+++ b/.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
diff --git a/.github/workflows/container_images.yml b/.github/workflows/container_images.yml
index fdd136b..c4a2fd0 100644
--- a/.github/workflows/container_images.yml
+++ b/.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:
diff --git a/.github/workflows/releaseNigthly.yml b/.github/workflows/releaseNigthly.yml
index f0552e3..227bf23 100644
--- a/.github/workflows/releaseNigthly.yml
+++ b/.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
diff --git a/ci_images/focal_builder.dockerfile b/ci_images/focal_builder.dockerfile
index fc74bd1..13bb9fc 100644
--- a/ci_images/focal_builder.dockerfile
+++ b/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
\ No newline at end of file
+ENV PATH /home/runner/.local/bin:$PATH
diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py
index bcd9bfc..6123c42 100644
--- a/kiwixbuild/versions.py
+++ b/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',