smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update bionic docker image to use qt 5.15 instead of default qt version.

This commit is contained in:
Matthieu Gautier 2020-08-27 17:58:43 +02:00
parent f1dfa32a8d
commit 73e0cec0aa
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/ci_images/bionic_builder.dockerfile vendored
View File

@ -5,18 +5,21 @@ ENV OS_NAME bionic
RUN apt update -q \ RUN apt update -q \
&& dpkg --add-architecture i386 \ && dpkg --add-architecture i386 \
&& apt install -q -y --no-install-recommends software-properties-common \
&& add-apt-repository ppa:beineri/opt-qt-5.15.2-bionic \
&& apt-get update \
&& apt install -q -y --no-install-recommends \ && apt install -q -y --no-install-recommends \
# 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 curl \ ninja-build openssh-client curl libgl-dev \
# Python (2) is needed to install android-ndk # Python (2) is needed to install android-ndk
python \ python \
# Packaged dependencies # Packaged dependencies
libbz2-dev libmagic-dev uuid-dev zlib1g-dev default-jdk \ libbz2-dev libmagic-dev uuid-dev zlib1g-dev default-jdk \
libmicrohttpd-dev aria2 libgtest-dev \ libmicrohttpd-dev aria2 libgtest-dev libgl-dev \
# Qt packages # Qt packages
libqt5gui5 qtbase5-dev qtwebengine5-dev libqt5svg5-dev qt5-image-formats-plugins qt5-default \ qt515base qt515webengine qt515svg qt515imageformats qt515wayland \
# To create the appimage of kiwix-desktop # To create the appimage of kiwix-desktop
libfuse2 fuse patchelf \ libfuse2 fuse patchelf \
# Flatpak tools # Flatpak tools
@ -34,3 +37,5 @@ RUN useradd --create-home runner
USER runner USER runner
WORKDIR /home/runner WORKDIR /home/runner
ENV PATH /home/runner/.local/bin:$PATH ENV PATH /home/runner/.local/bin:$PATH
RUN echo "source /opt/qt515/bin/qt515-env.sh" >> /home/runner/.bashrc

4
.github/workflows/ci.yml vendored
View File

@ -6,7 +6,7 @@ on:
- cron: '0 1 * * *' - cron: '0 1 * * *'
env: env:
DOCKER_VERSION: 30 DOCKER_VERSION: 31
jobs: jobs:
Docker: Docker:
@ -66,7 +66,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: Docker needs: Docker
container: container:
image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-30" image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-31"
steps: steps:
- name: Checkout code - name: Checkout code
shell: bash shell: bash

4
.github/workflows/releaseNigthly.yml vendored
View File

@ -8,7 +8,7 @@ on:
- cron: '0 1 * * *' - cron: '0 1 * * *'
env: env:
DOCKER_VERSION: 30 DOCKER_VERSION: 31
jobs: jobs:
Docker: Docker:
@ -79,7 +79,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: Docker needs: Docker
container: container:
image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-30" image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-31"
options: "--device /dev/fuse --privileged" options: "--device /dev/fuse --privileged"
steps: steps:
- name: Checkout code - name: Checkout code