From cd82eb6a08d280855a9032d48595010642b3ecbb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 5 Nov 2024 13:38:58 +0000
Subject: [PATCH] Ensure reprepro.yaml works in ubuntu-24.04

---
 .github/workflows/reprepro.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/reprepro.yaml b/.github/workflows/reprepro.yaml
index ef7ca49..042688c 100644
--- a/.github/workflows/reprepro.yaml
+++ b/.github/workflows/reprepro.yaml
@@ -29,7 +29,7 @@ jobs:
     reprepro:
         name: Deploy debian package
         environment: packages.element.io
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-24.04
         env:
             R2_BUCKET: ${{ vars.R2_BUCKET }}
             R2_DB_BUCKET: ${{ vars.R2_DB_BUCKET }}
@@ -96,6 +96,8 @@ jobs:
                   sudo cp debian/element-io-archive-keyring.gpg /usr/share/keyrings/element-io-archive-keyring.gpg
                   # Point apt at local apt repo overwriting all default sources
                   echo "deb [signed-by=/usr/share/keyrings/element-io-archive-keyring.gpg] http://localhost:8000/debian/ default main" | sudo tee /etc/apt/sources.list
+                  # Later ubuntu versions use the `conf.d` approach so we need to remove the default sources
+                  rm -R /etc/apt/sources.list.d/*
 
                   sudo apt-get update --allow-insecure-repositories