From 584056c6c016421214ccdec8e01334d06e5b8287 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 19 Nov 2024 13:30:52 +0100
Subject: [PATCH] Run GitHub Actions on Ubuntu 24.04

On Ubuntu the file /usr/bin/rename is managed through alternatives
because there are multiple implementations. It appears that
awalsh128/cache-apt-pkgs-action doesn't update alternatives when a
package is cached which means /usr/bin/rename isn't present.

The latest image will change to 24.04 on between December and January
but on 24.04 there is rename.ul from util-linux which also provides the
rename. That avoids the need to rely on awalsh128/cache-apt-pkgs-action
for it and the alternatives interaction.
---
 .github/workflows/deploy.yml | 6 +++---
 .github/workflows/test.yml   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index aa71571cfc3..9d3332f4cfa 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -25,7 +25,7 @@ jobs:
           persist-credentials: false
       - uses: awalsh128/cache-apt-pkgs-action@v1
         with:
-          packages: calibre rename
+          packages: calibre
       - name: Install and Build
         run: |
           npm install
@@ -46,7 +46,7 @@ jobs:
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d70f6bad896..f0bd5c4a811 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,7 +4,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4