From f8b986006f6b98598917a856de3c0bec537fb6c6 Mon Sep 17 00:00:00 2001
From: Ryan Christian <rchristian@ryanchristian.dev>
Date: Mon, 30 Sep 2024 20:10:00 -0500
Subject: [PATCH 1/2] ci: Update Tachometer reporter glob to support subdirs

---
 .github/workflows/pr-reporter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-reporter.yml b/.github/workflows/pr-reporter.yml
index 98f3a98891..63fea718ee 100644
--- a/.github/workflows/pr-reporter.yml
+++ b/.github/workflows/pr-reporter.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Report Tachometer Results
         uses: andrewiggins/tachometer-reporter-action@v2
         with:
-          path: results/*.json
+          path: results/**/*.json
           base-bench-name: preact-main
           pr-bench-name: preact-local
           summarize: 'duration, usedJSHeapSize'
\ No newline at end of file

From 6a66daaea56c00b6ec789ad43f111de6c03e542b Mon Sep 17 00:00:00 2001
From: Ryan Christian <33403762+rschristian@users.noreply.github.com>
Date: Tue, 1 Oct 2024 01:04:55 -0500
Subject: [PATCH 2/2] ci: Merge upload actions to fix usage in v4 (#4515)

* ci: Merge upload actions to avoid issues

* ci: Ensure bench reports are uploaded w/ unique names

* ci: Fix artifact names

* ci: Access name for result correctly
---
 .github/workflows/benchmarks.yml   | 11 ++++-------
 .github/workflows/run-bench.yml    |  3 ++-
 .github/workflows/single-bench.yml | 11 ++++-------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
index 885e126ca3..c7089ff63b 100644
--- a/.github/workflows/benchmarks.yml
+++ b/.github/workflows/benchmarks.yml
@@ -30,11 +30,6 @@ jobs:
         with:
           name: npm-package
       - run: mv preact.tgz preact-local.tgz
-      - name: Upload locally built preact package
-        uses: actions/upload-artifact@v4
-        with:
-          name: bench-environment
-          path: preact-local.tgz
       - name: Download base package
         uses: andrewiggins/download-base-artifact@v3
         with:
@@ -42,11 +37,13 @@ jobs:
           workflow: ci.yml
           required: false
       - run: mv preact.tgz preact-main.tgz
-      - name: Upload base preact package
+      - name: Upload locally build & base preact package
         uses: actions/upload-artifact@v4
         with:
           name: bench-environment
-          path: preact-main.tgz
+          path: |
+            preact-local.tgz
+            preact-main.tgz
 
   bench_todo:
     name: Bench todo
diff --git a/.github/workflows/run-bench.yml b/.github/workflows/run-bench.yml
index 68ca6e3e76..f741724499 100644
--- a/.github/workflows/run-bench.yml
+++ b/.github/workflows/run-bench.yml
@@ -107,11 +107,12 @@ jobs:
         id: log-artifact-name
         run: |
           NAME=$(echo "${{ inputs.benchmark }}" | sed -r 's/[\/]+/_/g')
+          echo "clean_name=$NAME" >> $GITHUB_OUTPUT
           echo "artifact_name=logs_$NAME" >> $GITHUB_OUTPUT
       - name: Upload results
         uses: actions/upload-artifact@v4
         with:
-          name: results
+          name: results-${{ steps.log-artifact-name.outputs.clean_name }}
           path: benchmarks/out/results/${{ inputs.benchmark }}.json
       - name: Upload logs
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/single-bench.yml b/.github/workflows/single-bench.yml
index 0286cec436..76e99147a4 100644
--- a/.github/workflows/single-bench.yml
+++ b/.github/workflows/single-bench.yml
@@ -61,11 +61,6 @@ jobs:
         with:
           name: npm-package
       - run: mv preact.tgz preact-local.tgz
-      - name: Upload locally built preact package
-        uses: actions/upload-artifact@v4
-        with:
-          name: bench-environment
-          path: preact-local.tgz
       - name: Clear working directory
         run: |
           ls -al
@@ -77,11 +72,13 @@ jobs:
         with:
           name: base-npm-package
       - run: mv preact.tgz preact-main.tgz
-      - name: Upload base preact package
+      - name: Upload locally built & base preact package
         uses: actions/upload-artifact@v4
         with:
           name: bench-environment
-          path: preact-main.tgz
+          path: |
+            preact-local.tgz
+            preact-main.tgz
 
   benchmark:
     name: Bench ${{ inputs.benchmark }}