Skip to content

Commit

Permalink
Merge pull request #34 from Group-5/hotfix/fix-workflow-error
Browse files Browse the repository at this point in the history
Hotfix/fix workflow error
  • Loading branch information
fredrjm authored Feb 26, 2026
2 parents b61d21d + 59e16f6 commit 2c1ce34
Show file tree
Hide file tree
Showing 19 changed files with 93 additions and 108 deletions.
24 changes: 2 additions & 22 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- main
- release/*
workflow_dispatch: # Allows manual triggering of the workflow


Expand Down Expand Up @@ -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
Expand All @@ -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'

45 changes: 45 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
##############################
## Java
##############################
.mtj.tmp/
*.class
*.jar
*.war
*.ear
*.nar
target/

##############################
## Maven
##############################
target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
pom.xml.bak
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
.mvn/wrapper/maven-wrapper.jar

##############################
## IntelliJ
##############################
out/
.idea/*
*.iml
*.ipr
*.iws

##############################
## Database
##############################
*.db
*.DS_Store

##############################
## VSCode
##############################
.vscode/
28 changes: 16 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,32 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

<groupId>edu.group5.app</groupId>
<artifactId>Help-Me-Help</artifactId>
<version>1.0-SNAPSHOT</version>

<name>Help-Me-Help</name>
<!-- FIXME change it to the project's website -->
<url>http://www.example.com</url>
<url>https://git.ntnu.no/Group-5/Help-Me-Help</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>25</maven.compiler.release>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.11.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- JUnit for testing -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>

<!-- JavaFX controls -->
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>${javafx.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/edu/group5/app/control/Wrapper.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package edu.group5.app.control;

public class Wrapper {

}
5 changes: 5 additions & 0 deletions src/main/java/edu/group5/app/model/donation/Donation.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package edu.group5.app.model.donation;

public class Donation {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package edu.group5.app.model.organization;

public class Organization {

}
5 changes: 5 additions & 0 deletions src/main/java/edu/group5/app/model/user/User.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package edu.group5.app.model.user;

public class User {

}
5 changes: 5 additions & 0 deletions src/main/java/edu/group5/app/utils/Utilities.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package edu.group5.app.utils;

public class Utilities {

}
5 changes: 5 additions & 0 deletions src/main/java/edu/group5/app/view/View.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package edu.group5.app.view;

public class View {

}
Binary file removed target/Help-Me-Help-1.0-SNAPSHOT.jar
Binary file not shown.
Binary file removed target/classes/edu/group5/app/App.class
Binary file not shown.
3 changes: 0 additions & 3 deletions target/maven-archiver/pom.properties

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

63 changes: 0 additions & 63 deletions target/surefire-reports/TEST-edu.group5.app.AppTest.xml

This file was deleted.

4 changes: 0 additions & 4 deletions target/surefire-reports/edu.group5.app.AppTest.txt

This file was deleted.

Binary file removed target/test-classes/edu/group5/app/AppTest.class
Binary file not shown.

0 comments on commit 2c1ce34

Please sign in to comment.