From 06c25301a596f6b006052cc079e927c2952767e3 Mon Sep 17 00:00:00 2001
From: ebbit1q <ebbit1q@gmail.com>
Date: Mon, 23 Jan 2023 18:14:35 -0500
Subject: [PATCH] update build dockerfiles (#4732)

---
 .ci/Fedora35/Dockerfile             | 21 ---------------------
 .ci/Fedora37/Dockerfile             | 14 ++++++++++++++
 .ci/UbuntuKinetic/Dockerfile        | 26 ++++++++++++++++++++++++++
 .ci/release_template.md             |  3 ++-
 .github/workflows/desktop-build.yml |  8 ++++++--
 5 files changed, 48 insertions(+), 24 deletions(-)
 delete mode 100644 .ci/Fedora35/Dockerfile
 create mode 100644 .ci/Fedora37/Dockerfile
 create mode 100644 .ci/UbuntuKinetic/Dockerfile

diff --git a/.ci/Fedora35/Dockerfile b/.ci/Fedora35/Dockerfile
deleted file mode 100644
index 615f1265..00000000
--- a/.ci/Fedora35/Dockerfile
+++ /dev/null
@@ -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
diff --git a/.ci/Fedora37/Dockerfile b/.ci/Fedora37/Dockerfile
new file mode 100644
index 00000000..3b4775be
--- /dev/null
+++ b/.ci/Fedora37/Dockerfile
@@ -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
diff --git a/.ci/UbuntuKinetic/Dockerfile b/.ci/UbuntuKinetic/Dockerfile
new file mode 100644
index 00000000..4433d161
--- /dev/null
+++ b/.ci/UbuntuKinetic/Dockerfile
@@ -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/*
diff --git a/.ci/release_template.md b/.ci/release_template.md
index beb89fb8..b7240f25 100644
--- a/.ci/release_template.md
+++ b/.ci/release_template.md
@@ -17,10 +17,11 @@ include different targets -->
  - <kbd>Ubuntu 18.04</kbd> ("Bionic Beaver")
  - <kbd>Ubuntu 20.04</kbd> ("Focal Fossa")
  - <kbd>Ubuntu 22.04</kbd> ("Jammy Jellyfish")
+ - <kbd>Ubuntu 22.10</kbd> ("Kinetic Kudu")
  - <kbd>Debian 10</kbd> ("Buster")
  - <kbd>Debian 11</kbd> ("Bullseye")
- - <kbd>Fedora 35</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>General linux support is available via a flatpak package (Flathub)</kbd></i>
 </pre>
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index c7e32927..2e2b2299 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -91,11 +91,11 @@ jobs:
           - distro: Debian11
             package: DEB
 
-          - distro: Fedora35
+          - distro: Fedora36
             package: RPM
             test: skip
 
-          - distro: Fedora36
+          - distro: Fedora37
             package: RPM
 
           - distro: UbuntuBionic
@@ -107,6 +107,10 @@ jobs:
 
           - distro: UbuntuJammy
             package: DEB
+            test: skip # running tests on all distros is superfluous
+
+          - distro: UbuntuKinetic
+            package: DEB
 
     name: ${{matrix.distro}}
     needs: configure