From 794787218be77ee42ebd170030873cd936363e56 Mon Sep 17 00:00:00 2001
From: Friedrich von Never <friedrich@fornever.me>
Date: Sun, 15 Jun 2025 22:49:23 +0200
Subject: [PATCH 1/4] CI: update to Ubuntu 24.04

---
 .github/workflows/docker.yml | 2 +-
 .github/workflows/main.yml   | 4 +++-
 .github/workflows/test.yml   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index f3d92ce..0d3c2c1 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   push:
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-24.04'
     steps:
       - uses: actions/checkout@v2
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b8d1835..283bdde 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,7 +13,9 @@ jobs:
     runs-on: ${{ matrix.image }}
     strategy:
       matrix:
-        image: [ ubuntu-20.04, windows-2019 ]
+        image:
+          - ubuntu-24.04
+          - windows-2019
     steps:
       - uses: actions/checkout@v2
       - name: SBT Cache
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 91b1073..c458e95 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     services:
       postgres:

From ab522cffd16129cf98d4b8121a9fdc02d8e12514 Mon Sep 17 00:00:00 2001
From: Friedrich von Never <friedrich@fornever.me>
Date: Sun, 15 Jun 2025 22:50:47 +0200
Subject: [PATCH 2/4] CI: update to actions/cache v4

---
 .github/workflows/main.yml | 2 +-
 .github/workflows/test.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 283bdde..f36466e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: SBT Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.ivy2/cache
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c458e95..fd8b390 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -42,7 +42,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: SBT Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.ivy2/cache

From 1e66e0854d3d8fcb529e59e371cbf6d1f6611b4e Mon Sep 17 00:00:00 2001
From: Friedrich von Never <friedrich@fornever.me>
Date: Sun, 15 Jun 2025 22:53:48 +0200
Subject: [PATCH 3/4] CI: set up SBT

---
 .github/workflows/main.yml | 4 ++++
 .github/workflows/test.yml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f36466e..2d6b6de 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,6 +18,10 @@ jobs:
           - windows-2019
     steps:
       - uses: actions/checkout@v2
+
+      - name: Set up SBT
+        uses: sbt/setup-sbt@v1
+
       - name: SBT Cache
         uses: actions/cache@v4
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fd8b390..463d55e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -41,6 +41,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+
+      - name: Set up SBT
+        uses: sbt/setup-sbt@v1
+
       - name: SBT Cache
         uses: actions/cache@v4
         with:

From c30627cc39c0705b08d9ad5f7edd98666bdddf13 Mon Sep 17 00:00:00 2001
From: Friedrich von Never <friedrich@fornever.me>
Date: Sun, 15 Jun 2025 23:01:03 +0200
Subject: [PATCH 4/4] CI: set up JDK 11

---
 .github/workflows/main.yml | 15 +++++++--------
 .github/workflows/test.yml | 15 +++++++--------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2d6b6de..a62eb7e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,16 +19,15 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'corretto'
+          java-version: '11'
+          cache: 'sbt'
+
       - name: Set up SBT
         uses: sbt/setup-sbt@v1
 
-      - name: SBT Cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.ivy2/cache
-            ~/.sbt
-          key: main.${{ runner.os }}.sbt.${{ hashFiles('**/*.sbt') }}+${{ hashFiles('project/build.properties') }}
-
       - name: Build
         run: sbt dist
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 463d55e..b8d4d81 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -42,17 +42,16 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'corretto'
+          java-version: '11'
+          cache: 'sbt'
+
       - name: Set up SBT
         uses: sbt/setup-sbt@v1
 
-      - name: SBT Cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.ivy2/cache
-            ~/.sbt
-          key: test.${{ runner.os }}.sbt.${{ hashFiles('**/*.sbt') }}+${{ hashFiles('project/build.properties') }}
-
       - name: Database Setup
         run: psql postgresql://horta:hell@localhost/loglist -c 'create extension pgcrypto;'