From a0805f3a9ddb9721ceb1b05a8390fa0b845f217e Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Tue, 6 Apr 2021 20:42:23 +0200
Subject: [PATCH] Use the job name in Surefire Reports artifact names

Believe it or not, that's the only way to be able to map them to the
jobs as the numeric id is not available in the workflow.
---
 .github/workflows/ci-actions-incremental.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci-actions-incremental.yml b/.github/workflows/ci-actions-incremental.yml
index b86895db90dab..4a10e876b1925 100644
--- a/.github/workflows/ci-actions-incremental.yml
+++ b/.github/workflows/ci-actions-incremental.yml
@@ -243,7 +243,7 @@ jobs:
         uses: actions/upload-artifact@v2
         if: failure()
         with:
-          name: surefire-reports-jvm-linux-jdk${{matrix.java.name}}
+          name: "surefire-reports-JVM Tests - JDK ${{matrix.java.name}}"
           path: "**/target/*-reports/TEST-*.xml"
           retention-days: 2
 
@@ -296,7 +296,7 @@ jobs:
         uses: actions/upload-artifact@v2
         if: failure()
         with:
-          name: surefire-reports-jvm-windows-jdk11
+          name: "surefire-reports-JVM Tests - JDK 11 Windows"
           path: "**/target/*-reports/TEST-*.xml"
           retention-days: 2
 
@@ -351,7 +351,7 @@ jobs:
         uses: actions/upload-artifact@v2
         if: failure()
         with:
-          name: surefire-reports-maven-linux-jdk${{matrix.java.name}}
+          name: "surefire-reports-Maven Tests - JDK ${{matrix.java.name}}"
           path: "**/target/*-reports/TEST-*.xml"
           retention-days: 2
 
@@ -401,7 +401,7 @@ jobs:
         uses: actions/upload-artifact@v2
         if: failure()
         with:
-          name: surefire-reports-maven-windows-jdk11
+          name: "surefire-reports-Maven Tests - JDK 11 Windows"
           path: "**/target/*-reports/TEST-*.xml"
           retention-days: 2
 
@@ -466,7 +466,7 @@ jobs:
         uses: actions/upload-artifact@v2
         if: failure()
         with:
-          name: surefire-reports-gradle-${{ matrix.os.path }}-jdk11
+          name: "surefire-reports-Gradle Tests - JDK 11 ${{matrix.os.family}}"
           path: "**/build/test-results/test/TEST-*.xml"
           retention-days: 2
 
@@ -521,7 +521,7 @@ jobs:
         uses: actions/upload-artifact@v2
         if: failure()
         with:
-          name: surefire-reports-devtools-linux-jdk${{matrix.java.name}}
+          name: "surefire-reports-Devtools Tests - JDK ${{matrix.java.name}}"
           path: "**/target/*-reports/TEST-*.xml"
           retention-days: 2
 
@@ -571,7 +571,7 @@ jobs:
         uses: actions/upload-artifact@v2
         if: failure()
         with:
-          name: surefire-reports-devtools-windows-jdk${{matrix.java.name}}
+          name: "surefire-reports-Devtools Tests - JDK 11 Windows"
           path: "**/target/*-reports/TEST-*.xml"
           retention-days: 2
 
@@ -634,7 +634,7 @@ jobs:
         uses: actions/upload-artifact@v2
         if: failure()
         with:
-          name: surefire-reports-microprofile-tck-tests
+          name: "surefire-reports-MicroProfile TCKs Tests"
           path: "**/target/*-reports/TEST-*.xml"
           retention-days: 2
 
@@ -720,7 +720,7 @@ jobs:
         uses: actions/upload-artifact@v2
         if: failure()
         with:
-          name: surefire-reports-native-linux-${{matrix.category}}
+          name: "surefire-reports-Native Tests - ${{matrix.category}}"
           path: "**/target/*-reports/TEST-*.xml"
           retention-days: 2
   native-tests-windows:
@@ -803,6 +803,6 @@ jobs:
         uses: actions/upload-artifact@v2
         if: failure()
         with:
-          name: surefire-reports-native-windows-${{matrix.category}}
+          name: "surefire-reports-Native Tests - Windows - ${{matrix.category}}"
           path: "**/target/*-reports/TEST-*.xml"
           retention-days: 2