From c9e9c5c070b3d9ed3be6cef02b8acf016ebd6a41 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 5 Apr 2023 15:03:35 +0200 Subject: [PATCH 1/4] =?UTF-8?q?Move=20all=20our=20CI=C2=A0to=20focal=20ins?= =?UTF-8?q?tead=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', From 0919f4d3dd8acdbae57988c1ead7f955fd1e9494 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 5 Apr 2023 15:23:08 +0200 Subject: [PATCH 2/4] [WIP] Use the docker image of our branch. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a60f47f..db94518 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 From d00c06da32132a99dc3433be34a8a8c249c062a4 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 5 Apr 2023 15:28:03 +0200 Subject: [PATCH 3/4] Use last version of linuxdeployqt. LinuxDeployQt check for the libc version to not being to recent. As we have change the version of libc by moving to focal, we have to update the version of LinuxDeployQt. --- scripts/create_kiwix-desktop_appImage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/create_kiwix-desktop_appImage.sh b/scripts/create_kiwix-desktop_appImage.sh index 259ee49..9d7f927 100755 --- a/scripts/create_kiwix-desktop_appImage.sh +++ b/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 From e6d04fb7600c16fb4a313f44f9a0c91ba39eaf99 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 12 Apr 2023 14:27:56 +0200 Subject: [PATCH 4/4] Update README. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3f582ff..acb5728 100644 --- a/README.md +++ b/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)