From 520bf688ef034a495ec94fbfe55caf2c035c9b52 Mon Sep 17 00:00:00 2001
From: Falko Modler <famod@users.noreply.github.com>
Date: Mon, 19 Apr 2021 23:57:21 +0200
Subject: [PATCH] CI: 'Upload Surefire reports' also for cancelled()

---
 .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 282573200d68d..ae511aa8fc6c2 100644
--- a/.github/workflows/ci-actions-incremental.yml
+++ b/.github/workflows/ci-actions-incremental.yml
@@ -236,7 +236,7 @@ jobs:
           path: 'test-reports.tgz'
       - name: Upload Surefire reports (if build failed)
         uses: actions/upload-artifact@v2
-        if: failure()
+        if: ${{ failure() || cancelled() }}
         with:
           name: "surefire-reports-JVM Tests - JDK ${{matrix.java.name}}"
           path: "**/target/*-reports/TEST-*.xml"
@@ -289,7 +289,7 @@ jobs:
           path: 'test-reports.tgz'
       - name: Upload Surefire reports (if build failed)
         uses: actions/upload-artifact@v2
-        if: failure()
+        if: ${{ failure() || cancelled() }}
         with:
           name: "surefire-reports-JVM Tests - JDK 11 Windows"
           path: "**/target/*-reports/TEST-*.xml"
@@ -346,7 +346,7 @@ jobs:
           path: 'test-reports.tgz'
       - name: Upload Surefire reports (if build failed)
         uses: actions/upload-artifact@v2
-        if: failure()
+        if: ${{ failure() || cancelled() }}
         with:
           name: "surefire-reports-Maven Tests - JDK ${{matrix.java.name}}"
           path: "**/target/*-reports/TEST-*.xml"
@@ -398,7 +398,7 @@ jobs:
           path: 'test-reports.tgz'
       - name: Upload Surefire reports (if build failed)
         uses: actions/upload-artifact@v2
-        if: failure()
+        if: ${{ failure() || cancelled() }}
         with:
           name: "surefire-reports-Maven Tests - JDK 11 Windows"
           path: "**/target/*-reports/TEST-*.xml"
@@ -467,7 +467,7 @@ jobs:
         run: ./mvnw $COMMON_MAVEN_ARGS $JVM_TEST_MAVEN_OPTS install -pl integration-tests/gradle ${{ needs.build-jdk11.outputs.gib_args }}
       - name: Upload Surefire reports (if build failed)
         uses: actions/upload-artifact@v2
-        if: failure()
+        if: ${{ failure() || cancelled() }}
         with:
           name: "surefire-reports-Gradle Tests - JDK 11 ${{matrix.os.family}}"
           path: "**/build/test-results/test/TEST-*.xml"
@@ -522,7 +522,7 @@ jobs:
           path: 'test-reports.tgz'
       - name: Upload Surefire reports (if build failed)
         uses: actions/upload-artifact@v2
-        if: failure()
+        if: ${{ failure() || cancelled() }}
         with:
           name: "surefire-reports-Devtools Tests - JDK ${{matrix.java.name}}"
           path: "**/target/*-reports/TEST-*.xml"
@@ -572,7 +572,7 @@ jobs:
           path: 'test-reports.tgz'
       - name: Upload Surefire reports (if build failed)
         uses: actions/upload-artifact@v2
-        if: failure()
+        if: ${{ failure() || cancelled() }}
         with:
           name: "surefire-reports-Devtools Tests - JDK 11 Windows"
           path: "**/target/*-reports/TEST-*.xml"
@@ -636,7 +636,7 @@ jobs:
           path: 'test-reports.tgz'
       - name: Upload Surefire reports (if build failed)
         uses: actions/upload-artifact@v2
-        if: failure()
+        if: ${{ failure() || cancelled() }}
         with:
           name: "surefire-reports-MicroProfile TCKs Tests"
           path: "**/target/*-reports/TEST-*.xml"
@@ -725,7 +725,7 @@ jobs:
           path: 'test-reports.tgz'
       - name: Upload Surefire reports (if build failed)
         uses: actions/upload-artifact@v2
-        if: failure()
+        if: ${{ failure() || cancelled() }}
         with:
           name: "surefire-reports-Native Tests - ${{matrix.category}}"
           path: "**/target/*-reports/TEST-*.xml"
@@ -812,7 +812,7 @@ jobs:
           path: 'test-reports.tgz'
       - name: Upload Surefire reports (if build failed)
         uses: actions/upload-artifact@v2
-        if: failure()
+        if: ${{ failure() || cancelled() }}
         with:
           name: "surefire-reports-Native Tests - Windows - ${{matrix.category}}"
           path: "**/target/*-reports/TEST-*.xml"