update build dockerfiles (#4732)
This commit is contained in:
parent
43dbb45cc6
commit
06c25301a5
5 changed files with 48 additions and 24 deletions
|
@ -1,21 +0,0 @@
|
||||||
FROM fedora:35
|
|
||||||
|
|
||||||
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
|
|
14
.ci/Fedora37/Dockerfile
Normal file
14
.ci/Fedora37/Dockerfile
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
FROM fedora:37
|
||||||
|
|
||||||
|
RUN dnf install -y \
|
||||||
|
ccache \
|
||||||
|
cmake \
|
||||||
|
gcc-c++ \
|
||||||
|
git \
|
||||||
|
mariadb-devel \
|
||||||
|
protobuf-devel \
|
||||||
|
qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
|
||||||
|
rpm-build \
|
||||||
|
xz-devel \
|
||||||
|
zlib-devel \
|
||||||
|
&& dnf clean all
|
26
.ci/UbuntuKinetic/Dockerfile
Normal file
26
.ci/UbuntuKinetic/Dockerfile
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
FROM ubuntu:kinetic
|
||||||
|
|
||||||
|
RUN apt-get update && \
|
||||||
|
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
|
||||||
|
build-essential \
|
||||||
|
ccache \
|
||||||
|
clang-format \
|
||||||
|
cmake \
|
||||||
|
file \
|
||||||
|
g++ \
|
||||||
|
git \
|
||||||
|
libgl-dev \
|
||||||
|
liblzma-dev \
|
||||||
|
libmariadb-dev-compat \
|
||||||
|
libprotobuf-dev \
|
||||||
|
libqt6multimedia6 \
|
||||||
|
libqt6sql6-mysql \
|
||||||
|
libqt6svg6-dev \
|
||||||
|
libqt6websockets6-dev \
|
||||||
|
protobuf-compiler \
|
||||||
|
qt6-l10n-tools \
|
||||||
|
qt6-multimedia-dev \
|
||||||
|
qt6-tools-dev \
|
||||||
|
qt6-tools-dev-tools \
|
||||||
|
&& apt-get clean \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
|
@ -17,10 +17,11 @@ include different targets -->
|
||||||
- <kbd>Ubuntu 18.04</kbd> ("Bionic Beaver")
|
- <kbd>Ubuntu 18.04</kbd> ("Bionic Beaver")
|
||||||
- <kbd>Ubuntu 20.04</kbd> ("Focal Fossa")
|
- <kbd>Ubuntu 20.04</kbd> ("Focal Fossa")
|
||||||
- <kbd>Ubuntu 22.04</kbd> ("Jammy Jellyfish")
|
- <kbd>Ubuntu 22.04</kbd> ("Jammy Jellyfish")
|
||||||
|
- <kbd>Ubuntu 22.10</kbd> ("Kinetic Kudu")
|
||||||
- <kbd>Debian 10</kbd> ("Buster")
|
- <kbd>Debian 10</kbd> ("Buster")
|
||||||
- <kbd>Debian 11</kbd> ("Bullseye")
|
- <kbd>Debian 11</kbd> ("Bullseye")
|
||||||
- <kbd>Fedora 35</kbd>
|
|
||||||
- <kbd>Fedora 36</kbd>
|
- <kbd>Fedora 36</kbd>
|
||||||
|
- <kbd>Fedora 37</kbd>
|
||||||
<kbd>We are also packaged in Arch Linux's official community repository, courtesy of @FFY00</kbd></i>
|
<kbd>We are also packaged in Arch Linux's official community repository, courtesy of @FFY00</kbd></i>
|
||||||
<kbd>General linux support is available via a flatpak package (Flathub)</kbd></i>
|
<kbd>General linux support is available via a flatpak package (Flathub)</kbd></i>
|
||||||
</pre>
|
</pre>
|
||||||
|
|
8
.github/workflows/desktop-build.yml
vendored
8
.github/workflows/desktop-build.yml
vendored
|
@ -91,11 +91,11 @@ jobs:
|
||||||
- distro: Debian11
|
- distro: Debian11
|
||||||
package: DEB
|
package: DEB
|
||||||
|
|
||||||
- distro: Fedora35
|
- distro: Fedora36
|
||||||
package: RPM
|
package: RPM
|
||||||
test: skip
|
test: skip
|
||||||
|
|
||||||
- distro: Fedora36
|
- distro: Fedora37
|
||||||
package: RPM
|
package: RPM
|
||||||
|
|
||||||
- distro: UbuntuBionic
|
- distro: UbuntuBionic
|
||||||
|
@ -107,6 +107,10 @@ jobs:
|
||||||
|
|
||||||
- distro: UbuntuJammy
|
- distro: UbuntuJammy
|
||||||
package: DEB
|
package: DEB
|
||||||
|
test: skip # running tests on all distros is superfluous
|
||||||
|
|
||||||
|
- distro: UbuntuKinetic
|
||||||
|
package: DEB
|
||||||
|
|
||||||
name: ${{matrix.distro}}
|
name: ${{matrix.distro}}
|
||||||
needs: configure
|
needs: configure
|
||||||
|
|
Loading…
Reference in a new issue