From f9acc3d4ac0d7eb869485975c12e56128dee5b93 Mon Sep 17 00:00:00 2001 From: MatheaGjerde Date: Tue, 24 Feb 2026 14:16:11 +0100 Subject: [PATCH 1/4] Build: added javafx dependencies --- pom.xml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 52c5902..9be90b9 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 17 + 25 @@ -40,6 +40,11 @@ junit-jupiter-params test + + org.openjfx + javafx-controls + 25.0.1 + @@ -84,6 +89,14 @@ maven-project-info-reports-plugin 3.6.1 + + org.openjfx + javafx-maven-plugin + 0.0.8 + + edu.group5.app.App + + From 9265dd2e6bd79b09c5ed01a971881937d868244b Mon Sep 17 00:00:00 2001 From: Lucy Ciara Herud-Thomassen Date: Wed, 25 Feb 2026 14:24:10 +0100 Subject: [PATCH 2/4] update[workflows]: include release branches for workflow automation Added 'release/*' to branches, which will theoretically include any release branches for workflow automation --- .github/workflows/main.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 9ad367c..1f7e934 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -4,6 +4,7 @@ on: push: branches: - main + - release/* workflow_dispatch: # Allows manual triggering of the workflow From d43a91b77a9f43b24b1e406df57b8ce9dd3c3790 Mon Sep 17 00:00:00 2001 From: Lucy Ciara Herud-Thomassen <86323303+LucyCiara@users.noreply.github.com> Date: Wed, 25 Feb 2026 18:49:43 +0100 Subject: [PATCH 3/4] Revert "Merge pull request #31 from Group-5/lucych-patch-1" This reverts commit 3b4bb0711d0f9fb8cd1531796dd2cb4159ce1126, reversing changes made to ea3b80d61f8c41e95549430a60692c763960326c. --- .github/workflows/main.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 1f7e934..9ad367c 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -4,7 +4,6 @@ on: push: branches: - main - - release/* workflow_dispatch: # Allows manual triggering of the workflow From 35f6a167d4f084fcfc7a16668472e2e072611f8e Mon Sep 17 00:00:00 2001 From: Lucy Ciara Herud-Thomassen <86323303+LucyCiara@users.noreply.github.com> Date: Thu, 26 Feb 2026 11:05:10 +0100 Subject: [PATCH 4/4] update: remove unnecessary workflow steps causing issues, and re-add release branches to workflow --- .github/workflows/main.yaml | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 9ad367c..3dbf59e 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -4,6 +4,7 @@ on: push: branches: - main + - release/* workflow_dispatch: # Allows manual triggering of the workflow @@ -33,16 +34,6 @@ jobs: java-version: '25' - name: Run Tests run: mvn clean test - - name: Upload Test Results - uses: actions/upload-artifact@v3 - with: - name: surefire-reports - path: target/surefire-reports/ - - name: Upload Coverage Report - uses: actions/upload-artifact@v3 - with: - name: jacoco-report - path: target/jacoco/coverage-reports/jacoco.xml package: name: Package @@ -62,15 +53,4 @@ jobs: name: packaged-app path: target/Help-Me-Help-1.0-SNAPSHOT-jar-with-dependencies.jar - deployPages: - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: self-hosted - steps: - - uses: actions/checkout@v3 - - name: Set up JDK - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '25' +