Merge branch 'master' into dependabot/github_actions/actions/upload-a…

…rtifact-4.3.3
adoptium · Apr 30, 2024 · f9c8110 · f9c8110
2 parents b85ff9d + 85810c7
commit f9c8110
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -175,7 +175,7 @@ jobs:
   merge-results:
     name: Merge Test Results
     needs: check-packages
-    if: github.event_name == 'pull_request' || github.repository_owner != 'adoptium'
+    if: always()
     runs-on: ubuntu-latest
     steps:  
       - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7

diff --git a/.github/workflows/linuxTriage.yml b/.github/workflows/linuxTriage.yml
@@ -18,3 +18,4 @@ jobs:
         name: JUnit Test Report           # Name of the check run which will be created
         path: '**/build/test-results/**/TEST-*.xml' # Path to test results (inside artifact .zip)
         reporter: java-junit              # Format of test results
+        fail-on-empty: false