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:
parent
63fe34437a
commit
ecf57b4226
3 changed files with 53 additions and 0 deletions
21
.ci/Fedora34/Dockerfile
Normal file
21
.ci/Fedora34/Dockerfile
Normal 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
|
24
.ci/UbuntuHirsute/Dockerfile
Normal file
24
.ci/UbuntuHirsute/Dockerfile
Normal 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/*
|
8
.github/workflows/ci-builds.yml
vendored
8
.github/workflows/ci-builds.yml
vendored
|
@ -82,8 +82,12 @@ jobs:
|
||||||
matrix:
|
matrix:
|
||||||
# these names correspond to the files in .ci/$distro
|
# these names correspond to the files in .ci/$distro
|
||||||
include:
|
include:
|
||||||
|
- distro: UbuntuHirsute
|
||||||
|
package: DEB
|
||||||
|
|
||||||
- distro: UbuntuGroovy
|
- distro: UbuntuGroovy
|
||||||
package: DEB
|
package: DEB
|
||||||
|
test: skip
|
||||||
|
|
||||||
- distro: UbuntuFocal
|
- distro: UbuntuFocal
|
||||||
package: DEB
|
package: DEB
|
||||||
|
@ -103,6 +107,10 @@ jobs:
|
||||||
package: RPM
|
package: RPM
|
||||||
test: skip # Fedora is our slowest build
|
test: skip # Fedora is our slowest build
|
||||||
|
|
||||||
|
- distro: Fedora34
|
||||||
|
package: RPM
|
||||||
|
test: skip # gtest does not compile for some reason
|
||||||
|
|
||||||
name: ${{matrix.distro}}
|
name: ${{matrix.distro}}
|
||||||
|
|
||||||
needs: configure
|
needs: configure
|
||||||
|
|
Loading…
Reference in a new issue