From 368ff1793fbcffe8422d05f3c6d9286629652460 Mon Sep 17 00:00:00 2001 From: tooomm Date: Sun, 16 Jan 2022 22:46:04 +0100 Subject: [PATCH] CI: Add Debian 11 (#4525) * add debian 11 * rename debian10 * fix space * Update Dockerfile --- .ci/{DebianBuster => Debian10}/Dockerfile | 2 +- .ci/Debian11/Dockerfile | 24 +++++++++++++++++++++++ .github/workflows/desktop-build.yml | 12 ++++++++---- 3 files changed, 33 insertions(+), 5 deletions(-) rename .ci/{DebianBuster => Debian10}/Dockerfile (96%) create mode 100644 .ci/Debian11/Dockerfile diff --git a/.ci/DebianBuster/Dockerfile b/.ci/Debian10/Dockerfile similarity index 96% rename from .ci/DebianBuster/Dockerfile rename to .ci/Debian10/Dockerfile index 82109e70..5dda090e 100644 --- a/.ci/DebianBuster/Dockerfile +++ b/.ci/Debian10/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster +FROM debian:10 RUN apt-get update && apt-get install -y --no-install-recommends \ build-essential \ diff --git a/.ci/Debian11/Dockerfile b/.ci/Debian11/Dockerfile new file mode 100644 index 00000000..a42967eb --- /dev/null +++ b/.ci/Debian11/Dockerfile @@ -0,0 +1,24 @@ +FROM debian:11 + +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/* diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index f08412c4..98c772e6 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -102,16 +102,20 @@ jobs: package: skip # we are packaged in arch already allow-failure: yes - - distro: DebianBuster + - distro: Debian10 + package: DEB + + - distro: Debian11 package: DEB - - - distro: Fedora35 - package: RPM - distro: Fedora34 package: RPM test: skip # gtest does not compile for some reason + - distro: Fedora35 + package: RPM + + name: ${{matrix.distro}} needs: configure