From bf89aedaa9e9df820517fb3ca7e9dc6d78dc60f8 Mon Sep 17 00:00:00 2001
From: Jahn <jahnf@users.noreply.github.com>
Date: Fri, 13 Oct 2023 14:53:15 +0200
Subject: [PATCH] ci: add ubuntu 23.04 and debian bookworm

---
 .github/workflows/ci-build.yml    |  7 +++++--
 docker/Dockerfile.debian-bookworm | 23 +++++++++++++++++++++++
 docker/Dockerfile.ubuntu-23.04    | 23 +++++++++++++++++++++++
 3 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 docker/Dockerfile.debian-bookworm
 create mode 100644 docker/Dockerfile.ubuntu-23.04

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 9141abe..6d0706c 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -25,11 +25,13 @@ jobs:
         - debian-stretch
         - debian-buster
         - debian-bullseye
+        - debian-bookworm
         - ubuntu-18.04
         - ubuntu-20.04
         - ubuntu-20.10
         - ubuntu-21.04
         - ubuntu-22.04
+        - ubuntu-23.04
         - opensuse-15.0
         - opensuse-15.1
         - opensuse-15.2
@@ -193,9 +195,10 @@ jobs:
         filename=$(basename -- "${{ env.dist_pkg_artifact }}")
         export PKG_TYPE="${filename##*.}"
         declare -A distromap=( ["debian-stretch"]="debian/stretch" ["debian-buster"]="debian/buster" \
-          ["debian-bullseye"]="debian/bullseye" ["ubuntu-18.04"]="ubuntu/bionic" \
+          ["debian-bullseye"]="debian/bullseye" ["debian-bookworm"]="debian/bookworm" \
+          ["ubuntu-18.04"]="ubuntu/bionic" \
           ["ubuntu-20.04"]="ubuntu/focal" ["ubuntu-21.04"]="ubuntu/hirsute" \
-          ["ubuntu-22.04"]="ubuntu/jammy" \
+          ["ubuntu-22.04"]="ubuntu/jammy" ["ubuntu-23.04"]="ubuntu/lunar" \
           ["opensuse-15.1"]="opensuse/15.1" ["opensuse-15.2"]="opensuse/15.2" \
           ["opensuse-15.3"]="opensuse/15.3" ["opensuse-15.4"]="opensuse/15.4" \
           ["opensuse-15.5"]="opensuse/15.5" ["centos-8"]="el/8" \
diff --git a/docker/Dockerfile.debian-bookworm b/docker/Dockerfile.debian-bookworm
new file mode 100644
index 0000000..705d877
--- /dev/null
+++ b/docker/Dockerfile.debian-bookworm
@@ -0,0 +1,23 @@
+# Container for building the Projecteur package
+# Images available at: https://hub.docker.com/r/jahnf/projecteur/tags
+
+FROM debian:bookworm
+
+RUN apt-get update && mkdir /build
+RUN DEBIAN_FRONTEND="noninteractive" \
+ apt-get install -y --no-install-recommends \
+  ca-certificates \
+  g++ \
+  make \
+  cmake \
+  udev \
+  git \
+  pkg-config \
+  qtdeclarative5-dev \
+  qttools5-dev-tools \
+  qttools5-dev \
+  libqt5x11extras5-dev \
+  libusb-1.0-0-dev \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN git config --global --add safe.directory /source
diff --git a/docker/Dockerfile.ubuntu-23.04 b/docker/Dockerfile.ubuntu-23.04
new file mode 100644
index 0000000..5f0c20b
--- /dev/null
+++ b/docker/Dockerfile.ubuntu-23.04
@@ -0,0 +1,23 @@
+# Container for building the Projecteur package
+# Images available at: https://hub.docker.com/r/jahnf/projecteur/tags
+
+FROM ubuntu:23.04
+
+RUN apt-get update && mkdir /build
+RUN DEBIAN_FRONTEND="noninteractive" \
+ apt-get install -y --no-install-recommends \
+  ca-certificates \
+  g++ \
+  make \
+  cmake \
+  udev \
+  git \
+  pkg-config \
+  qtdeclarative5-dev \
+  qttools5-dev-tools \
+  qttools5-dev \
+  libqt5x11extras5-dev \
+  libusb-1.0-0-dev \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN git config --global --add safe.directory /source