From 6ee5cd2abeeb6c9001e183fc272b45e4aa95aecf Mon Sep 17 00:00:00 2001
From: Laurents Meyer <laucomm@gmail.com>
Date: Tue, 5 Mar 2024 16:05:14 +0100
Subject: [PATCH] Fix test related CI workflows. (#225)

---
 .github/workflows/pull_request.yml | 4 ++--
 .github/workflows/push.yml         | 2 +-
 .github/workflows/test_results.yml | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index be95564..eb0a494 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -110,7 +110,7 @@ jobs:
           $defaultConnection = '${{ matrix.dataAccessProviderType }}' -eq 'ODBC' ? 'DBQ=Jet.accdb' : 'Data Source=Jet.accdb;Persist Security Info=False;'
           echo "defaultConnection=$defaultConnection" >> $env:GITHUB_ENV
 
-          $matrixId = '${{ matrix.aceVersion }}-${{ matrix.aceArchitecture }}-' + '${{ matrix.dataAccessProviderType }}'.Replace(' ', '') + '${{ matrix.os }}'
+          $matrixId = '${{ matrix.aceVersion }}-${{ matrix.aceArchitecture }}-' + '${{ matrix.dataAccessProviderType }}'.Replace(' ', '') + '-${{ matrix.os }}'
           echo "matrixId=$matrixId" >> $env:GITHUB_ENV
       - name: Output Variables
         shell: pwsh
@@ -385,7 +385,7 @@ jobs:
             });
             
             var artifacts = allArtifacts.data.artifacts.filter((artifact) => {
-              return artifact.name.startsWith("test-results_")
+              return artifact.name.startsWith("green-tests_")
             });
             
             if (artifacts.length > 0) {
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 8a66ff4..7df3658 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -387,7 +387,7 @@ jobs:
             });
             
             var artifacts = allArtifacts.data.artifacts.filter((artifact) => {
-              return artifact.name.startsWith("test-results_")
+              return artifact.name.startsWith("green-tests_")
             });
             
             if (artifacts.length > 0) {
diff --git a/.github/workflows/test_results.yml b/.github/workflows/test_results.yml
index a84d76f..6a80a14 100644
--- a/.github/workflows/test_results.yml
+++ b/.github/workflows/test_results.yml
@@ -63,6 +63,7 @@ jobs:
         with:
           name: test-results
           path: test-results
+          run-id: ${{ github.event.workflow_run.id }}
       - name: 'Publish Test Report'
         if: steps.DownloadArtifact.result == 'success'
         uses: dorny/test-reporter@v1