add fedora 34 and ubuntu 21.04 (#4331)

* add fedora 34 and ubuntu 21.04

* remove qt5-default from ubuntu 21.04

apparently it's not required?

* disable tests on fedora 34
This commit is contained in:
ebbit1q 2021-05-08 06:24:38 +02:00 committed by GitHub
parent 63fe34437a
commit ecf57b4226
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 0 deletions

21
.ci/Fedora34/Dockerfile Normal file
View file

@ -0,0 +1,21 @@
FROM fedora:34
RUN dnf install -y \
@development-tools \
ccache \
cmake \
desktop-file-utils \
file \
gcc-c++ \
git \
hicolor-icon-theme \
libappstream-glib \
mariadb-devel \
protobuf-devel \
qt5-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
rpm-build \
sqlite-devel \
wget \
xz-devel \
zlib-devel \
&& dnf clean all

View file

@ -0,0 +1,24 @@
FROM ubuntu:hirsute
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
build-essential \
ccache \
clang-format \
cmake \
file \
g++ \
git \
liblzma-dev \
libmariadb-dev-compat \
libprotobuf-dev \
libqt5multimedia5-plugins \
libqt5sql5-mysql \
libqt5svg5-dev \
libqt5websockets5-dev \
protobuf-compiler \
qtmultimedia5-dev \
qttools5-dev \
qttools5-dev-tools \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

View file

@ -82,8 +82,12 @@ jobs:
matrix:
# these names correspond to the files in .ci/$distro
include:
- distro: UbuntuHirsute
package: DEB
- distro: UbuntuGroovy
package: DEB
test: skip
- distro: UbuntuFocal
package: DEB
@ -103,6 +107,10 @@ jobs:
package: RPM
test: skip # Fedora is our slowest build
- distro: Fedora34
package: RPM
test: skip # gtest does not compile for some reason
name: ${{matrix.distro}}
needs: configure