From 5bd39123982d707e4506ad505ff959fd26dc13ca Mon Sep 17 00:00:00 2001
From: jandrlik <jandrlik@redhat.com>
Date: Mon, 6 Nov 2023 14:20:59 +0100
Subject: [PATCH] fixing yaml file for GH actions to correctly pack and upload
 logfiles

---
 .github/workflows/test.yaml | 42 ++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 71c4a11..4341e0d 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -8,11 +8,12 @@ on:
     branches:
       - "*"
 env:
-  jdkver_latest: 20
+  jdkver_latest: 21
+  WORKSPACE: /home/runner/workspace
 
 jobs:
-  test-linux-sdk:
-    name: "Linux"
+  test-temurin-sdk:
+    name: "Temurin jdk"
     runs-on: "ubuntu-latest"
     strategy:
       fail-fast: false
@@ -37,12 +38,22 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.jdkver || env.jdkver_latest }}
       - name: Run
-        run: |
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver }} BOOTJDK_DIR=~/bootjdk JRESDK="sdk"
+        run: | 
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JRESDK="jdk"
           ./testHeadlessComponents.sh
-
-  test-linux-jre:
-    name: "Linux"
+      - name: Pack results
+        if: ${{ always() }}
+        run: |
+          tar -cf "results-jdk${{ matrix.jdkver || env.jdkver_latest }}.tar.gz" $WORKSPACE/testHeadlessComponent.log $WORKSPACE/testHeadlessComponent.jtr.xml
+      - name: Upload results
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v3
+        with:
+          path: "results-jdk${{ matrix.jdkver || env.jdkver_latest }}.tar.gz"
+        continue-on-error: true
+        
+  test-temurin-jre:
+    name: "Temurin jre"
     runs-on: "ubuntu-latest"
     strategy:
       fail-fast: false
@@ -67,6 +78,17 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.jdkver || env.jdkver_latest }}
       - name: Run
-        run: |
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver }} BOOTJDK_DIR=~/bootjdk JRESDK="jre"
+        run: | 
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JRESDK="jre"
           ./testHeadlessComponents.sh
+      - name: Pack results
+        if: ${{ always() }}
+        run: |
+          tar -cf "results-jre${{ matrix.jdkver || env.jdkver_latest }}.tar.gz" $WORKSPACE/testHeadlessComponent.log $WORKSPACE/testHeadlessComponent.jtr.xml
+      - name: Upload results
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v3
+        with:
+          path: "results-jre${{ matrix.jdkver || env.jdkver_latest }}.tar.gz"
+        continue-on-error: true
+