From 6318a554c935e038baef8b970591b9b19e70f86f Mon Sep 17 00:00:00 2001
From: Ryan Christian <rchristian@ryanchristian.dev>
Date: Sat, 28 Sep 2024 14:31:01 -0500
Subject: [PATCH 1/4] ci: Merge upload actions to avoid issues

---
 .github/workflows/benchmarks.yml   | 11 ++++-------
 .github/workflows/single-bench.yml | 11 ++++-------
 2 files changed, 8 insertions(+), 14 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/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 }}

From 6e6d5a3ae5eecf23b3fec6fdbfff7f0d50d56345 Mon Sep 17 00:00:00 2001
From: Ryan Christian <rchristian@ryanchristian.dev>
Date: Sat, 28 Sep 2024 14:44:44 -0500
Subject: [PATCH 2/4] ci: Ensure bench reports are uploaded w/ unique names

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

diff --git a/.github/workflows/run-bench.yml b/.github/workflows/run-bench.yml
index 68ca6e3e76..b09ba57743 100644
--- a/.github/workflows/run-bench.yml
+++ b/.github/workflows/run-bench.yml
@@ -111,7 +111,7 @@ jobs:
       - name: Upload results
         uses: actions/upload-artifact@v4
         with:
-          name: results
+          name: results${{ inputs.benchmark }}
           path: benchmarks/out/results/${{ inputs.benchmark }}.json
       - name: Upload logs
         uses: actions/upload-artifact@v4

From cb5df4c19bca2d7ae54926a9b827d4840eab3091 Mon Sep 17 00:00:00 2001
From: Ryan Christian <rchristian@ryanchristian.dev>
Date: Sat, 28 Sep 2024 14:54:28 -0500
Subject: [PATCH 3/4] ci: Fix artifact names

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

diff --git a/.github/workflows/run-bench.yml b/.github/workflows/run-bench.yml
index b09ba57743..4c05cff1da 100644
--- a/.github/workflows/run-bench.yml
+++ b/.github/workflows/run-bench.yml
@@ -111,7 +111,7 @@ jobs:
       - name: Upload results
         uses: actions/upload-artifact@v4
         with:
-          name: results${{ inputs.benchmark }}
+          name: results-${{ env.NAME }}
           path: benchmarks/out/results/${{ inputs.benchmark }}.json
       - name: Upload logs
         uses: actions/upload-artifact@v4

From 871010a0a53bb4cab839667f047dd9e0e3187b5c Mon Sep 17 00:00:00 2001
From: Ryan Christian <rchristian@ryanchristian.dev>
Date: Sat, 28 Sep 2024 15:04:20 -0500
Subject: [PATCH 4/4] ci: Access name for result correctly

---
 .github/workflows/run-bench.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/run-bench.yml b/.github/workflows/run-bench.yml
index 4c05cff1da..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-${{ env.NAME }}
+          name: results-${{ steps.log-artifact-name.outputs.clean_name }}
           path: benchmarks/out/results/${{ inputs.benchmark }}.json
       - name: Upload logs
         uses: actions/upload-artifact@v4