From 53d202f536d3bbf76a680594e068f7d4d9cf2ced Mon Sep 17 00:00:00 2001
From: Florian Kleedorfer <florian.kleedorfer@austria.fm>
Date: Fri, 6 Dec 2024 17:13:24 +0100
Subject: [PATCH 1/2] Move SHACL-SHACL.ttl to src/build and validate shacl
 files in src (#1059)

Co-authored-by: steveraysteveray <steve@steveray.com>
---
 pom.xml                                            | 14 +++++++-------
 src/{main/rdf => build}/validation/SHACL-SHACL.ttl |  0
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename src/{main/rdf => build}/validation/SHACL-SHACL.ttl (100%)

diff --git a/pom.xml b/pom.xml
index 95d1a33f..c0a1a7a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
             Here are the phases and the execution ids that are linked to them (executed in the order they appear in this file):
                   validate                 defineAdditionalProperties, check-source-format
                   initialize               delete-applicable-units, format-sources, copy-rdf, copy-docs, copy-root-files
-                  generate-sources
+                  generate-sources         validate-shacl-files
                   process-sources          replace-version-placeholder
                   generate-resources
                   process-resources
@@ -176,8 +176,8 @@
                         SHACL-that the SHACL definition conform to SHACL
                         writes the validation report target/validation/validationReportShacl.ttl
                         -->
-                        <id>shacl-validate-shacl</id>
-                        <phase>test</phase>
+                        <id>validate-shacl-files</id>
+                        <phase>generate-sources</phase>
                         <goals>
                             <goal>validate</goal>
                         </goals>
@@ -186,13 +186,13 @@
                                 <validation>
                                     <!--skip>true</skip-->
                                     <shapes>
-                                        <include>target/dist/validation/SHACL-SHACL.ttl</include>
+                                        <include>src/build/validation/SHACL-SHACL.ttl</include>
                                     </shapes>
                                     <data>
                                         <include>
-                                            target/dist/validation/COLLECTION_QUDT_QA_TESTS_ALL.ttl
-                                            target/dist/validation/COLLECTION_QUDT_USER_TESTS.ttl
-                                            target/dist/schema/shacl/SCHEMA_QUDT_NoOWL.ttl
+                                            src/main/rdf/validation/COLLECTION_QUDT_QA_TESTS_ALL.ttl
+                                            src/main/rdf/validation/COLLECTION_QUDT_USER_TESTS.ttl
+                                            src/main/rdf/schema/shacl/SCHEMA_QUDT_NoOWL.ttl
                                         </include>
                                     </data>
                                     <outputFile>target/validation/validationReportShacl.ttl</outputFile>
diff --git a/src/main/rdf/validation/SHACL-SHACL.ttl b/src/build/validation/SHACL-SHACL.ttl
similarity index 100%
rename from src/main/rdf/validation/SHACL-SHACL.ttl
rename to src/build/validation/SHACL-SHACL.ttl

From 6f5684139ed438eab4d08f4505056f1c9af90cf9 Mon Sep 17 00:00:00 2001
From: Florian Kleedorfer <florian.kleedorfer@austria.fm>
Date: Fri, 6 Dec 2024 17:17:33 +0100
Subject: [PATCH 2/2] Fix the format checking step (#1060)

---
 .github/workflows/format.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 247dcb95..e8e829ff 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -36,7 +36,13 @@ jobs:
 
       # Check formatting and exit early (with success) if format is ok
       - name: Check formatting
-        run: mvn spotless:check && ( echo "Source was already formatted, nothing was touched." >> $GITHUB_STEP_SUMMARY ; exit 0 )
+        run: |
+          if mvn spotless:check; then
+            echo "Source was already formatted, nothing was touched." >> $GITHUB_STEP_SUMMARY
+            exit 0
+          else
+            echo "Sources need formatting, we'll do that now"
+          fi
 
       # Apply formatting (changelog was touched)
       - name: Apply formatting