Fix the remaining tests.

neoforged · May 31, 2024 · 56c5639 · 56c5639
1 parent 9314db5
commit 56c5639
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/test-prs.yml b/.github/workflows/test-prs.yml
@@ -154,7 +154,7 @@ jobs:
     name: Process Test Data
     runs-on: ubuntu-latest
     needs: test
-    if: success() || failure()
+    if: always()
     steps:
       - uses: actions/checkout@v3
 
@@ -166,23 +166,28 @@ jobs:
 
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v4
-        if: success() || failure() # always run even if the previous step fails
+        if: always() # always run even if the previous step fails
         with:
           report_paths: '**/*.xml'
 
       - name: Merge Test Reports
-        if: success() || failure()
+        if: always()
         run: npx junit-report-merger junit.xml "**/*.xml"
 
       - uses: actions/upload-artifact@v4
-        if: success() || failure()
+        if: always()
         with:
           name: test-results
           path: junit.xml
 
       - name: Failed build detection
-        if: failure()
         uses: actions/github-script@v7
+        if: >-
+          ${{
+               contains(needs.*.result, 'failure')
+            || contains(needs.*.result, 'cancelled')
+            || contains(needs.*.result, 'skipped')
+          }}
         with:
           script: |
             core.setFailed('Test build failure!')

diff --git a/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/RunTests.groovy b/userdev/src/functionalTest/groovy/net/neoforged/gradle/userdev/RunTests.groovy
@@ -152,7 +152,7 @@ class RunTests extends BuilderBasedTestSpecification {
 
         classpathFile.exists()
 
-        classpathFile.text.contains("org.graalvm.polyglot/polyglot")
+        classpathFile.text.contains("org.graalvm.polyglot${File.separator}polyglot")
         !classpathFile.text.contains(".pom")
     }
 

diff --git a/...tionalTest/groovy/net/neoforged/gradle/userdev/convention/SourceSetConventionTests.groovy b/...tionalTest/groovy/net/neoforged/gradle/userdev/convention/SourceSetConventionTests.groovy
@@ -421,7 +421,7 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
 
         classpathFile.exists()
 
-        !classpathFile.text.contains("org.jgrapht/jgrapht-core")
+        !classpathFile.text.contains("org.jgrapht${File.separator}jgrapht-core")
     }
 
     def "enabling sourceset local run runtime registration conventions registers localRunRuntime"() {
@@ -468,7 +468,7 @@ class SourceSetConventionTests extends BuilderBasedTestSpecification {
 
         classpathFile.exists()
 
-        classpathFile.text.contains("org.jgrapht/jgrapht-core")
+        classpathFile.text.contains("org.jgrapht${File.separator}jgrapht-core")
     }
 
     def "using the local runtime convention configuration does not put the dependency on the runtime config"() {