diff --git a/.ci/Debian11/Dockerfile b/.ci/Debian11/Dockerfile deleted file mode 100644 index b994863bf..000000000 --- a/.ci/Debian11/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -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 \ - ninja-build \ - protobuf-compiler \ - qt5-image-formats-plugins \ - qtmultimedia5-dev \ - qttools5-dev \ - qttools5-dev-tools \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* diff --git a/.ci/Servatrice_Debian11/Dockerfile b/.ci/Servatrice_Debian12/Dockerfile similarity index 75% rename from .ci/Servatrice_Debian11/Dockerfile rename to .ci/Servatrice_Debian12/Dockerfile index fadc9e0e7..21f6a036e 100644 --- a/.ci/Servatrice_Debian11/Dockerfile +++ b/.ci/Servatrice_Debian12/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:11 +FROM debian:12 RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ @@ -11,11 +11,11 @@ RUN apt-get update && \ git \ libmariadb-dev-compat \ libprotobuf-dev \ - libqt5sql5-mysql \ - libqt5websockets5-dev \ + libqt6sql6-mysql \ ninja-build \ protobuf-compiler \ - qttools5-dev \ - qttools5-dev-tools \ + qt6-tools-dev \ + qt6-tools-dev-tools \ + qt6-websockets-dev \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/.ci/Ubuntu22.04/Dockerfile b/.ci/Ubuntu22.04/Dockerfile deleted file mode 100644 index ff2e6e43b..000000000 --- a/.ci/Ubuntu22.04/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -FROM ubuntu:22.04 - -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 \ - ninja-build \ - protobuf-compiler \ - qt6-image-formats-plugins \ - 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 0e6c05165..0fdb7ecb4 100644 --- a/.ci/release_template.md +++ b/.ci/release_template.md @@ -18,10 +18,8 @@ Available pre-compiled binaries for installation: LinuxUbuntu 24.04 LTS Noble Numbat - • Ubuntu 22.04 LTS Jammy JellyfishDebian 13 TrixieDebian 12 Bookworm - • Debian 11 BullseyeFedora 43Fedora 42 diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index 02c3f7aec..99977ab01 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -111,12 +111,8 @@ jobs: package: skip # We are packaged in Arch already allow-failure: yes - - distro: Debian - version: 11 - package: DEB - - distro: Servatrice_Debian - version: 11 + version: 12 package: DEB test: skip server_only: yes @@ -139,10 +135,6 @@ jobs: version: 43 package: RPM - - distro: Ubuntu - version: 22.04 - package: DEB - - distro: Ubuntu version: 24.04 package: DEB