From f312eeab04058057672b255e4e488a9a169946e4 Mon Sep 17 00:00:00 2001
From: Jesse Jaara <jesse.jaara@vincit.fi>
Date: Thu, 5 Sep 2024 13:32:57 +0300
Subject: [PATCH] Update Github Workflows

* Run on Ubuntu 24.04 or 22.04 for tasks requiring e2e env
* Use actions/setup-java build-in cache
* Update suzuki-shunsuke/github-action-renovate-config-validator to  1.1.0
---
 .github/workflows/cd.yml                       |  5 ++++-
 .github/workflows/check-renovatebot-config.yml |  2 +-
 .github/workflows/ci.yml                       | 10 ++--------
 .github/workflows/ktlint.yml                   | 10 ++--------
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index a96ab80..cf6f78c 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -21,7 +21,7 @@ jobs:
       - run_unit_tests
       - check_code_formatting
     name: Build & Push docker image to dockerhub
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -66,6 +66,9 @@ jobs:
       - check_code_formatting
       - push_to_registry
     name: Run e2e tests
+    # These must run on ubuntu 22.04 or older.
+    # The MS SQL server used by jore4-jore3-importer,
+    # does not run on Linux kernels newer than 6.6.x.
     runs-on: ubuntu-22.04
     steps:
       - name: Extract metadata to env variables
diff --git a/.github/workflows/check-renovatebot-config.yml b/.github/workflows/check-renovatebot-config.yml
index b3f8d71..8d189ee 100644
--- a/.github/workflows/check-renovatebot-config.yml
+++ b/.github/workflows/check-renovatebot-config.yml
@@ -12,6 +12,6 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Validate
-        uses: suzuki-shunsuke/github-action-renovate-config-validator@v1.0.1
+        uses: suzuki-shunsuke/github-action-renovate-config-validator@v1.1.0
         with:
           config_file_path: .github/renovate.json5
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9f56282..1881bb6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   tests:
     name: Run auth backend tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code
@@ -20,13 +20,7 @@ jobs:
           java-package: jdk
           architecture: x64
           distribution: temurin
-
-      - name: Cache Maven packages
-        uses: actions/cache@v4
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+          cahce: maven
 
       - name: Run tests
         run: mvn clean verify -Pall-tests
diff --git a/.github/workflows/ktlint.yml b/.github/workflows/ktlint.yml
index 63f9a2f..711181c 100644
--- a/.github/workflows/ktlint.yml
+++ b/.github/workflows/ktlint.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   spotless:
     name: Check code is formatted with ktlint
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code
@@ -19,13 +19,7 @@ jobs:
           java-package: jdk
           architecture: x64
           distribution: temurin
-
-      - name: Cache Maven packages
-        uses: actions/cache@v4
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+          cahce: maven
 
       - name: Run ktlint Check
         run: mvn ktlint:check