Update Github workflows

.github/renovate.json5

@@ -6,12 +6,11 @@
     // Note: if the rule feels generic enough, should consider adding it to the jore4 default preset
     packageRules: [
         {
-            // restrict spring boot updates to <3 versions for now
+            // restrict spring boot updates to <4 versions for now
             groupName: "spring boot",
             groupSlug: "spring-boot",
             matchPackageNames: ["org.springframework.boot"],
-            matchPackagePrefixes: ["org.springframework.boot:"],
-            allowedVersions: "<3",
+            allowedVersions: "<4",
         },
     ],
 }

.github/workflows/check-renovatebot-config.yml

@@ -6,12 +6,12 @@ on:
 jobs:
   validate:
     name: Validate renovatebot config
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Validate
-        uses: suzuki-shunsuke/github-action-renovate-config-validator@v0.1.3
+        uses: suzuki-shunsuke/github-action-renovate-config-validator@v1.0.1
         with:
           config_file_path: .github/renovate.json5

.github/workflows/docker-build.yml

@@ -4,17 +4,18 @@ on:
   push:
     branches:
       - main
-    paths-ignore:
-      - "**.md"
   pull_request:
-    paths-ignore:
-      - "**.md"
   workflow_dispatch:
 
 jobs:
+  run_java_tests:
+    name: Run Java tests
+    uses: ./.github/workflows/run-java-tests.yml
+
   push_to_registry:
+    needs: run_java_tests
     name: Build & Push docker image to Docker Hub
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code
@@ -71,25 +72,10 @@ jobs:
             -t $IMAGE_NAME:latest \
             .
 
-  run_e2e_tests:
-    name: Run cypress e2e tests
-    needs: push_to_registry
-    runs-on: ubuntu-22.04
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Extract metadata to env variables
-        uses: HSLdevcom/jore4-tools/github-actions/extract-metadata@extract-metadata-v1
-
-      - name: Start e2e env
-        uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v1
-        with:
-          mapmatching_version: "${{ env.IMAGE_NAME }}:${{ env.COMMIT_ID }}"
+  run_cypress_tests:
+    needs:
+      - run_java_tests
+      - push_to_registry
+    uses: ./.github/workflows/run-cypress-tests.yml
 
-      - name: Seed infrastructure links
-        uses: HSLdevcom/jore4-tools/github-actions/seed-infrastructure-links@seed-infrastructure-links-v1
 
-      - name: Run e2e tests from github action
-        uses: HSLdevcom/jore4-tools/github-actions/run-cypress-tests@run-cypress-tests-v1

.github/workflows/generate-jooq.yml

@@ -2,28 +2,29 @@ name: Generate jooq
 
 on:
   push:
+    branches:
+      - main
   pull_request:
-    branches: [main]
 
 jobs:
   generate-jooq:
     name: Verifies whether generated jooq classes have been updated
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: "17"
           java-package: jdk
           architecture: x64
           distribution: temurin
 
       - name: Cache Maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

.github/workflows/run-cypress-tests.yml

@@ -0,0 +1,22 @@
+name: Run cypress tests
+
+on:
+  # this workflow is only called by others, won't be executed on itself
+  workflow_call:
+
+jobs:
+  run_cypress_tests:
+    name: Run cypress e2e tests
+    # These must run on ubuntu 22.04 or older.
+    # The MS SQL server used by jore4-jore3-importer needs,
+    # does not run on Linux kernels newer than 6.6.x.
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Extract metadata to env variables
+        uses: HSLdevcom/jore4-tools/github-actions/extract-metadata@extract-metadata-v1
+
+      - name: Start e2e env
+        uses: HSLdevcom/jore4-tools/github-actions/run-ci@main
+        with:
+          timetables_api_version: "${{ env.IMAGE_NAME }}:${{ env.COMMIT_ID }}"

.github/workflows/java-tests.yml → .github/workflows/run-java-tests.yml

@@ -1,14 +1,13 @@
 name: Run java tests
 
 on:
-  push:
-  pull_request:
-    branches: [main]
+  # this workflow is only called by others, won't be executed on itself
+  workflow_call:
 
 jobs:
   run-tests:
     name: Run java tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code
@@ -18,15 +17,15 @@ jobs:
         run: ./development.sh start:devdeps
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: "17"
           java-package: jdk
           architecture: x64
           distribution: temurin
 
       - name: Cache Maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

.github/workflows/test-docker-compose.yml

@@ -2,13 +2,15 @@ name: Test whether the dockerized version works
 
 on:
   push:
+    branches:
+      - main
   pull_request:
-    branches: [main]
+
 
 jobs:
   test-docker-compose:
     name: verify docker-compose setup
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code

development.sh

@@ -6,7 +6,7 @@ set -euo pipefail
 WD=$(dirname "$0")
 cd "${WD}"
 
-DOCKER_COMPOSE_CMD="docker-compose -f ./docker/docker-compose.yml"
+DOCKER_COMPOSE_CMD="docker compose -f ./docker/docker-compose.yml"
 
 function start_prod_database {
   $DOCKER_COMPOSE_CMD up --build -d jore4-mapmatchingdb