From 49c3c2c6bb86250a6b79d6507f287a7825404df2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@freedom.press>
Date: Mon, 14 Oct 2024 17:02:17 +0200
Subject: [PATCH] Add support for 24.10 (oracular)

Refs #947
---
 .github/workflows/build.yml       |  2 ++
 .github/workflows/check_repos.yml |  2 ++
 .github/workflows/ci.yml          | 10 ++++++++--
 CHANGELOG.md                      |  1 +
 INSTALL.md                        |  1 +
 dev_scripts/qa.py                 |  5 +++++
 6 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7abe094..9f29805 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,6 +37,8 @@ jobs:
             version: "23.10"
           - distro: ubuntu
             version: "24.04"
+          - distro: ubuntu
+            version: "24.10"
           - distro: debian
             version: bullseye
           - distro: debian
diff --git a/.github/workflows/check_repos.yml b/.github/workflows/check_repos.yml
index ea7dac2..5a3a1dd 100644
--- a/.github/workflows/check_repos.yml
+++ b/.github/workflows/check_repos.yml
@@ -19,6 +19,8 @@ jobs:
     strategy:
       matrix:
         include:
+          - distro: ubuntu
+            version: "24.10"  # oracular
           - distro: ubuntu
             version: "24.04"  # noble
           - distro: ubuntu
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0c4229b..b363843 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -93,9 +93,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - runner: macos-latest  # CPU type: Apple Silicon (M1)
+          - runner: macos-latest # CPU type: Apple Silicon (M1)
             arch: arch64
-          - runner: macos-13  # CPU type: Intel x86_64
+          - runner: macos-13 # CPU type: Intel x86_64
             arch: x86_64
     env:
       DUMMY_CONVERSION: 1
@@ -124,6 +124,8 @@ jobs:
             version: "23.10"
           - distro: ubuntu
             version: "24.04"
+          - distro: ubuntu
+            version: "24.10"
           - distro: debian
             version: bullseye
           - distro: debian
@@ -192,6 +194,8 @@ jobs:
             version: "23.10"
           - distro: ubuntu
             version: "24.04"
+          - distro: ubuntu
+            version: "24.10"
           - distro: debian
             version: bullseye
           - distro: debian
@@ -309,6 +313,8 @@ jobs:
             version: "23.10"
           - distro: ubuntu
             version: "24.04"
+          - distro: ubuntu
+            version: "24.10"
           - distro: debian
             version: bullseye
           - distro: debian
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5cfe3e2..c132d89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ since 0.4.1, and this project adheres to [Semantic Versioning](https://semver.or
 ### Added
 
 - Point to the installation instructions that the Tails team maintains for Dangerzone ([announcement](https://tails.net/news/dangerzone/index.en.html))
+- Platform support: Ubuntu 24.10 and Fedora 41 ([issue #947](https://github.com/freedomofpress/dangerzone/issues/947))
 
 ## [0.7.1](https://github.com/freedomofpress/dangerzone/compare/v0.7.1...v0.7.0)
 
diff --git a/INSTALL.md b/INSTALL.md
index 14e61da..d31b36c 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -9,6 +9,7 @@ On Linux, Dangerzone uses [Podman](https://podman.io/) instead of Docker Desktop
 an isolated environment. It will be installed automatically when installing Dangerzone.
 
 Dangerzone is available for:
+- Ubuntu 24.10 (oracular)
 - Ubuntu 24.04 (noble)
 - Ubuntu 23.10 (mantic)
 - Ubuntu 22.04 (jammy)
diff --git a/dev_scripts/qa.py b/dev_scripts/qa.py
index 3f8e9ca..08a2097 100755
--- a/dev_scripts/qa.py
+++ b/dev_scripts/qa.py
@@ -948,6 +948,11 @@ class QAUbuntu2404(QADebianBased):
     VERSION = "24.04"
 
 
+class QAUbuntu2410(QADebianBased):
+    DISTRO = "ubuntu"
+    VERSION = "24.10"
+
+
 class QAFedora(QALinux):
     """Base class for Fedora distros.