From f74f0ff5010ab400183756362514651a4a5c848e Mon Sep 17 00:00:00 2001 From: Oleksandr Dzhychko Date: Thu, 24 Apr 2025 17:45:38 +0200 Subject: [PATCH 1/3] ci: configure GitHub Actions to package code Packaging code includes testing code. Code will be packaged when for pull request to `main` and commits on `main`. This should ensure fully working code on `main`. --- .github/workflows/package.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/package.yml diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml new file mode 100644 index 000000000..23cc4d5e9 --- /dev/null +++ b/.github/workflows/package.yml @@ -0,0 +1,28 @@ +name: Package + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + # Compile source and target are still specified in pom.xml + java-version: '21' + distribution: 'temurin' + cache: maven + - name: Build with Maven + run: mvn --batch-mode package + + # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive + - name: Update dependency graph + uses: advanced-security/maven-dependency-submission-action@v4 From 975cacb441e33ef1b4cf2b676b892839452c772e Mon Sep 17 00:00:00 2001 From: Oleksandr Dzhychko Date: Thu, 24 Apr 2025 18:01:10 +0200 Subject: [PATCH 2/3] test(arg-setaf): correct SetAfTheoryTest After fixes to SetAfs in b28918725be6300cb734d07fb972b90285d5dcd6 tests also needed to be corrected. --- .../src/test/java/SetAfTheoryTest.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/org-tweetyproject-arg-setaf/src/test/java/SetAfTheoryTest.java b/org-tweetyproject-arg-setaf/src/test/java/SetAfTheoryTest.java index 41e5a9e1f..19229d9c3 100644 --- a/org-tweetyproject-arg-setaf/src/test/java/SetAfTheoryTest.java +++ b/org-tweetyproject-arg-setaf/src/test/java/SetAfTheoryTest.java @@ -17,10 +17,7 @@ * Copyright 2021 The TweetyProject Team */ - - - -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.HashSet; import java.util.Set; @@ -36,6 +33,7 @@ * Examples of SetAf Theorys and their semantics * * @author Sebastian Franke + * @author Oleksandr Dzhychko * */ public class SetAfTheoryTest { @@ -69,12 +67,10 @@ public void extensionTest() { String grS = gr.getModel(s).toString(); String adS = ad.getModels(s).toString(); String prS = pr.getModels(s).toString(); - - assertTrue(grS.equals("{b,d}")); - assertTrue(adS.equals("[{b}, {d}, {b,d}, {}]")); - assertTrue(prS.equals("[{b,d}]")); - + assertEquals("{b,c,d}", grS); + assertEquals("[{b}, {d}, {b,d}, {b,c,d}, {}]", adS); + assertEquals("[{b,c,d}]", prS); } } From 8c9d0083b5a55ffc19339b2e82398306c27903fc Mon Sep 17 00:00:00 2001 From: Oleksandr Dzhychko Date: Thu, 24 Apr 2025 18:20:36 +0200 Subject: [PATCH 3/3] build: fix the path to `testBuild` folder Using `../testBuild` caused the following errors: ``` Error: Error fetching link: /home/runner/work/TweetyProject/TweetyProject/org-tweetyproject-logics-pl/home/runner/work/TweetyProject/TweetyProject/testBuild. Ignored it. Error: Error fetching link: /home/runner/work/TweetyProject/TweetyProject/org-tweetyproject-arg-dung/home/runner/work/TweetyProject/TweetyProject/testBuild. Ignored it. ``` Maven seems not to allow output in the parent folder of the project. --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 05f86bb85..50f247f8b 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ - ../testBuild + ./testBuild ${project.groupId}.${project.artifactId}-${project.version} @@ -125,7 +125,7 @@ - ../testBuild + ./testBuild ${project.groupId}.${project.artifactId}-${project.version} @@ -137,7 +137,7 @@ ${project.groupId}.${project.artifactId}-${project.version} - ../testBuild + ./testBuild