Merge remote-tracking branch 'ibex/main' into main

Author: maxkratz

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
   # This is necessary because some of the Github-hosted macOS-based runner
   # did trigger the API rate limit from time to time.
   collect-github-api-artifacts:
-    runs-on: [ubuntu-22.04]
+    runs-on: [ubuntu-24.04]
     steps:
       - name: Find emoflon-headless updatesite
         run: |
@@ -77,10 +77,12 @@ jobs:
 
   # Create splash image
   create-splash-image:
-    runs-on: [ubuntu-22.04]
+    runs-on: [ubuntu-24.04]
     steps:
       - name: Check out repository code
         uses: actions/checkout@v6
+      - name: Install dependencies
+        run: sudo apt-get install -yq imagemagick
       - name: Start message
         run: echo "Creating splash image for version $VERSION."
       - name: Run splash creator script
@@ -94,7 +96,7 @@ jobs:
   # Build Eclipse GIPS Linux user
   build-linux-user:
     needs: [create-splash-image, collect-github-api-artifacts]
-    runs-on: [ubuntu-22.04]
+    runs-on: [ubuntu-24.04]
     steps:
       - name: Start message
         run: echo "Started CI build (Eclipse GIPS Linux user)."
@@ -128,7 +130,7 @@ jobs:
   # Build Eclipse GIPS Linux user CI
   build-linux-user-ci:
     needs: [collect-github-api-artifacts]
-    runs-on: [ubuntu-22.04]
+    runs-on: [ubuntu-24.04]
     steps:
       - name: Start message
         run: echo "Started CI build (Eclipse GIPS Linux user CI)."
@@ -163,11 +165,11 @@ jobs:
     steps:
       - name: Start message
         run: echo "Started CI build (Eclipse GIPS macOS user)."
-      - name: Install dependencies
-        run: |
-          brew install p7zip coreutils grep wget curl
       - name: Check out repository code
         uses: actions/checkout@v6
+      - name: Install dependencies
+        run: |
+          bash scripts/install-macos-dependencies.sh
       - name: Download splash image
         uses: actions/download-artifact@v8
         with:
@@ -201,11 +203,11 @@ jobs:
     steps:
       - name: Start message
         run: echo "Started CI build (Eclipse GIPS macOS user)."
-      - name: Install dependencies
-        run: |
-          brew install p7zip coreutils grep wget curl
       - name: Check out repository code
         uses: actions/checkout@v6
+      - name: Install dependencies
+        run: |
+          bash scripts/install-macos-dependencies.sh
       - name: Download splash image
         uses: actions/download-artifact@v8
         with:
@@ -239,18 +241,18 @@ jobs:
     steps:
       - name: Start message
         run: echo "Started CI build (Eclipse GIPS Windows user)."
-      - name: Install dependencies
-        run: |
-          choco install wget curl unzip zip --no-progress
       - name: Install correct Java version
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'adopt'
           java-version: '16'
       - name: Fix Git line endings
         run: git config --global core.autocrlf input
       - name: Check out repository code
         uses: actions/checkout@v6
+      - name: Install dependencies
+        run: |
+          bash scripts/install-windows-dependencies.sh
       - name: Download splash image
         uses: actions/download-artifact@v8
         with:
@@ -279,7 +281,7 @@ jobs:
   # Create a release if running on tag
   create-release:
     needs: [build-linux-user, build-linux-user-ci, build-macos-user, build-macos-arm-user, build-windows-user]
-    runs-on: [ubuntu-22.04]
+    runs-on: [ubuntu-24.04]
     # Only run on pushed tags (and explicitely ignore scheduled runs)
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') && github.event_name != 'schedule'
     steps:

build.sh

@@ -213,6 +213,13 @@ remove_notification_urls () {
 # Script
 #
 
+# Patches the slf4j JAR file to fix an installation bug of the checkstyle plug-in.
+patch_slf4j_jar () {
+	log "Patching slf4j JAR."
+	SLF4J_JAR_FILE="org.slf4j.api_1.7.30.v20221112-0806.jar"
+	cp ./patches/$SLF4J_JAR_FILE $ECLIPSE_BASE_PATH/plugins/$SLF4J_JAR_FILE
+}
+
 # Check if script needs to download the initial Eclipse archive.
 if [[ ! -f "./$ARCHIVE_FILE" ]]; then
 	log "Downloading Eclipse $VERSION archive from $MIRROR."
@@ -256,6 +263,9 @@ fi
 # Install global Eclipse settings from config file
 install_global_eclipse_settings
 
+# Install slf4j via patch
+patch_slf4j_jar
+
 log "Install Eclipse plug-ins."
 for p in ${ORDER[@]}; do
 	# Check if eMoflon packages must be skipped (for dev builds).

patches/org.slf4j.api_1.7.30.v20221112-0806.jar

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -e
+
+DEPENDENCIES=("p7zip" "coreutils" "grep" "wget" "curl")
+
+# Displays the given input including "=> " on the console.
+log () {
+	echo "=> $1"
+}
+
+# Installs the given package via brew if it is not already installed.
+# Reference: https://apple.stackexchange.com/a/425118
+brew_install() {
+    log "Installing $1."
+    if brew list $1 &>/dev/null; then
+        log "${1} is already installed."
+    else
+        brew install $1 && log "$1 is installed."
+    fi
+}
+
+# Actually install all dependencies
+for p in ${DEPENDENCIES[@]}; do
+    brew_install $p
+done

scripts/install-macos-dependencies.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+DEPENDENCIES=("wget" "curl" "unzip" "zip")
+
+# Displays the given input including "=> " on the console.
+log () {
+	echo "=> $1"
+}
+
+# Actually install all dependencies
+for p in ${DEPENDENCIES[@]}; do
+    choco install $p --no-progress
+done