Merge pull request #1812 from CarlWachter/feat/cb

bench: publish benchmark data in separate workflow

Author: mkroening

.github/workflows/benchmark.yml

@@ -1,7 +1,7 @@
 name: Benchmark
 
 on:
-  pull_request_target:
+  pull_request:
   push:
     branches:
       - main
@@ -11,12 +11,7 @@ env:
 
 jobs:
   benchmark:
-    name: Run Benchmarks
     runs-on: [self-hosted]
-    environment: ${{ github.event_name == 'push' && 'benchmark' || '' }}
-
-    permissions:
-      pull-requests: write
 
     strategy:
       matrix:
@@ -50,14 +45,8 @@ jobs:
         id: run-bench
         with:
           benchmark-file: ${{ matrix.benchmark-file }}
-      - name: Store benchmark results
-        uses: hermit-os/github-action-benchmark@main
+      - name: Upload benchmark results
+        uses: actions/upload-artifact@v4
         with:
-          tool: "hermit-bench"
-          output-file-path: ${{ steps.run-bench.outputs.result-file }}
-          github-token: ${{ github.event_name == 'push' && secrets.HERMIT_BENCH_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
-          benchmark-data-dir-path: .
-          gh-repository: github.com/hermit-os/hermit-bench
-          comment-always: true
-          benchmark-matrix-name: ${{ matrix.benchmark-matrix-name }}
-          auto-push: ${{ github.event_name == 'push' }}
+          name: ${{ matrix.benchmark-matrix-name }}-benchmark-results
+          path: ${{ steps.run-bench.outputs.result-file }}

.github/workflows/publish_benchmark.yml

@@ -0,0 +1,71 @@
+name: Publish Benchmarks
+
+on:
+  workflow_run:
+    workflows: ["Benchmark"]
+    types:
+      - completed
+
+jobs:
+  publish_benchmarks:
+    runs-on: ubuntu-latest
+    environment: benchmark
+
+    permissions:
+      pull-requests: write
+
+    strategy:
+      matrix:
+        include:
+          - benchmark-matrix-name: General
+          - benchmark-matrix-name: Misc
+
+    env:
+      GH_TOKEN: ${{ github.token }}
+
+    steps:
+      - name: Download artifact from another workflow
+        run: |
+          run_id="${{ github.event.workflow_run.id }}"
+          artifact_name="${{ matrix.benchmark-matrix-name }}-benchmark-results"
+
+          echo "Fetching artifact '${artifact_name}' from run ${run_id}"
+
+          # List artifacts and extract matching ID
+          artifact_id=$(gh api \
+            repos/${{ github.repository }}/actions/runs/$run_id/artifacts \
+            --jq ".artifacts[] | select(.name == \"${artifact_name}\") | .id")
+
+          if [ -z "$artifact_id" ]; then
+            echo "Artifact '$artifact_name' not found"
+            exit 1
+          fi
+
+          gh api /repos/${{ github.repository }}/actions/artifacts/$artifact_id/zip > results.zip
+
+          unzip results.zip
+      - name: Comment benchmark results to PR
+        if: github.event.workflow_run.event == 'pull_request'
+        uses: hermit-os/github-action-benchmark@main
+        with:
+          tool: "hermit-bench"
+          output-file-path: results.json
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          benchmark-data-dir-path: .
+          gh-repository: github.com/hermit-os/hermit-bench
+          comment-always: true
+          benchmark-matrix-name: ${{ matrix.benchmark-matrix-name }}
+          ref: ${{ github.event.workflow_run.head_sha }}
+          pr-number: ${{ github.event.workflow_run.pull_requests[0].number }}
+      - name: Publish benchmark results to hermit-bench
+        if: github.event.workflow_run.event == 'push'
+        uses: hermit-os/github-action-benchmark@main
+        with:
+          tool: "hermit-bench"
+          output-file-path: results.json
+          github-token: ${{ secrets.HERMIT_BENCH_GITHUB_TOKEN }}
+          benchmark-data-dir-path: .
+          gh-repository: github.com/hermit-os/hermit-bench
+          benchmark-matrix-name: ${{ matrix.benchmark-matrix-name }}
+          auto-push: true
+          ref: ${{ github.event.workflow_run.head_sha }}