diff --git a/.travis.yml b/.travis.yml index b1acd68..6a9eb8c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,9 @@ jobs: - stage: build_docker_images script: *build_images env: VARIANT=bionic + - stage: build_docker_images + script: *build_images + env: VARIANT=focal - stage: build_docker_images script: *build_images env: VARIANT=f30 diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index bac7619..dc4905a 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -42,7 +42,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 = '57' +base_deps_meta_version = '58' base_deps_versions = { 'zlib' : '1.2.8', diff --git a/travis/focal_builder.dockerfile b/travis/focal_builder.dockerfile new file mode 100644 index 0000000..dba937a --- /dev/null +++ b/travis/focal_builder.dockerfile @@ -0,0 +1,37 @@ +FROM ubuntu:focal + +ENV LANG C.UTF-8 + +RUN apt update -q && \ + 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 \ +# Packaged dependencies + libbz2-dev libmagic-dev uuid-dev zlib1g-dev \ + libmicrohttpd-dev aria2 \ +# Qt packages + libqt5gui5 qtbase5-dev qtwebengine5-dev libqt5svg5-dev qt5-image-formats-plugins qt5-default \ +# To create the appimage of kiwix-desktop + 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 \ +# Other tools (to remove) +# vim less grep \ + && \ + apt-get clean -y && \ + rm -rf /var/lib/apt/lists/* /usr/share/doc/* /var/cache/debconf/* + +# Create user +RUN useradd --create-home ci_builder +USER ci_builder +WORKDIR /home/ci_builder +ENV PATH="/home/ci_builder/.local/bin:${PATH}" + +ENV TRAVIS_BUILD_DIR /home/ci_builder/kiwix-build +ENV TRAVIS_OS_NAME linux_focal + +CMD pip3 install --user ./kiwix-build && kiwix-build/travis/compile_all.py