Move all our CI to focal instead of bionic

Bionic is EOL.
This commit is contained in:
Matthieu Gautier 2023-04-05 15:03:35 +02:00 committed by Kelson
parent 3db22ba0bc
commit c9e9c5c070
5 changed files with 26 additions and 20 deletions

View File

@ -28,7 +28,7 @@ jobs:
- android_arm64 - android_arm64
- android_x86 - android_x86
- android_x86_64 - android_x86_64
image_variant: ['bionic'] image_variant: ['focal']
lib_postfix: ['/x86_64-linux-gnu'] lib_postfix: ['/x86_64-linux-gnu']
include: include:
- target: win32_static - target: win32_static

View File

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

View File

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

View File

@ -9,10 +9,14 @@ RUN apt update -q \
# Base build tools # Base build tools
build-essential automake libtool cmake ccache pkg-config autopoint patch \ build-essential automake libtool cmake ccache pkg-config autopoint patch \
python3-pip python3-setuptools python3-wheel git subversion wget unzip \ 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 # Packaged dependencies
libbz2-dev libmagic-dev uuid-dev zlib1g-dev \ 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 # Qt packages
libqt5gui5 qtbase5-dev qtwebengine5-dev libqt5svg5-dev qt5-image-formats-plugins qt5-default \ libqt5gui5 qtbase5-dev qtwebengine5-dev libqt5svg5-dev qt5-image-formats-plugins qt5-default \
# To create the appimage of kiwix-desktop # To create the appimage of kiwix-desktop
@ -21,6 +25,8 @@ RUN apt update -q \
elfutils flatpak flatpak-builder \ elfutils flatpak flatpak-builder \
# Cross win32 compiler # Cross win32 compiler
g++-mingw-w64-i686 gcc-mingw-w64-i686 gcc-mingw-w64-base mingw-w64-tools \ 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) # Other tools (to remove)
# vim less grep \ # vim less grep \
&& apt-get clean -y \ && apt-get clean -y \

View File

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