From 4bdbc5ac53b5ddb1c63508eecc1682ce08705d6f Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Tue, 9 Jun 2020 11:32:11 +0200
Subject: [PATCH] Build the base deps on bionics also.

This will allow other project to have their CI running on bionics.
---
 .github/ci_images/bionic_builder.dockerfile | 11 +++--
 .github/workflows/ci.yml                    | 45 +++------------------
 .github/workflows/releaseNigthly.yml        |  4 +-
 3 files changed, 15 insertions(+), 45 deletions(-)

diff --git a/.github/ci_images/bionic_builder.dockerfile b/.github/ci_images/bionic_builder.dockerfile
index e80c08d..1ace462 100644
--- a/.github/ci_images/bionic_builder.dockerfile
+++ b/.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
-    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 \
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8bfd707..4deee46 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:
    - cron: '0 1 * * *'
 
 env:
-  DOCKER_VERSION: 29
+  DOCKER_VERSION: 30
 
 jobs:
   Docker:
@@ -40,64 +40,31 @@ 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: i586_dyn
-            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
diff --git a/.github/workflows/releaseNigthly.yml b/.github/workflows/releaseNigthly.yml
index 87f8575..bfab9d1 100644
--- a/.github/workflows/releaseNigthly.yml
+++ b/.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