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

Author: rschristian

.github/workflows/benchmarks.yml

@@ -30,23 +30,20 @@ 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:
           artifact: npm-package
           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

.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

.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 }}