From aecc03c6d63ceca516eaecc90b8bcccf01622f01 Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Fri, 20 Oct 2023 17:17:51 +0200
Subject: [PATCH] Linux render test rework (#1777)

---
 .github/workflows/linux-ci.yml              |  4 ++--
 .github/workflows/pr-render-test-result.yml | 16 ++++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
index 598d02500..2bff4d223 100644
--- a/.github/workflows/linux-ci.yml
+++ b/.github/workflows/linux-ci.yml
@@ -147,12 +147,12 @@ jobs:
         run: xvfb-run -a build/mbgl-render-test-runner --manifestPath=metrics/linux-${{ matrix.renderer }}.json
 
       - name: Upload render test result
-        if: always() && steps.render_test.outcome == 'failure'
+        if: always() && steps.render_test.outcome == 'failure' && matrix.renderer == 'drawable'
         uses: actions/upload-artifact@v3
         with:
           name: render-test-result
           path: |
-            metrics/linux-gcc8-release-style.html
+            metrics/linux-drawable.html
       
       # expression tests
 
diff --git a/.github/workflows/pr-render-test-result.yml b/.github/workflows/pr-render-test-result.yml
index dcc08b92d..e2d72e970 100644
--- a/.github/workflows/pr-render-test-result.yml
+++ b/.github/workflows/pr-render-test-result.yml
@@ -13,14 +13,18 @@ on:
 jobs:
   upload-render-test-result:
     runs-on: ubuntu-22.04
-    if: github.event.workflow_run.event == 'pull_request'
+    env:
+      html_filename: "linux-drawable.html"
     steps:
       - uses: actions/checkout@v4
 
+      - uses: ./.github/actions/get-pr-number
+        id: get-pr-number
+
       - uses: ./.github/actions/download-workflow-run-artifact
         with:
           artifact-name: render-test-result
-          expect-files: "metrics/linux-gcc8-release-style.html"
+          expect-files: ${{ env.html_filename }}
   
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -32,14 +36,14 @@ jobs:
       - name: Upload render test results to S3
         id: upload_render_test_results
         run: |
-          aws s3 cp metrics/linux-gcc8-release-style.html \
-            s3://maplibre-native-test-artifacts/${{ github.run_id	}}-linux-gcc8-release-style.html \
+          aws s3 cp metrics/${{ env.html_filename }} \
+            s3://maplibre-native-test-artifacts/${{ github.run_id	}}-${{ env.html_filename }} \
             --expires "$(date -d '+30 days' --utc +'%Y-%m-%dT%H:%M:%SZ')"
 
       - name: 'Leave comment on PR with test results'
         uses: marocchino/sticky-pull-request-comment@v2
         with:
           header: render-test-result
-          number: ${{ github.event.workflow_run.pull_requests[0].number }}
+          number: ${{ steps.get-pr-number.outputs.pr-number }}
           message: |
-            Render test results at https://maplibre-native-test-artifacts.s3.eu-central-1.amazonaws.com/${{ github.run_id }}-linux-gcc8-release-style.html
+            Render test results at https://maplibre-native-test-artifacts.s3.eu-central-1.amazonaws.com/${{ github.run_id }}-${{ env.html_filename }}