ci(actions): fix downstream perf helper contract

Author: Stevengre

.github/workflows/downstream-perf.yml

@@ -65,6 +65,10 @@ jobs:
               - 'scripts/performance-tests-kevm.sh'
               - 'scripts/performance-tests-kontrol.sh'
               - 'scripts/compare.py'
+              - 'scripts/collect-downstream-perf-results.sh'
+              - 'scripts/downstream-perf-lib.sh'
+              - '.github/actions/downstream-perf-suite/**'
+              - '.github/actionlint.yaml'
               - '.github/workflows/downstream-perf.yml'
 
       - name: 'Decide suites'
@@ -199,13 +203,15 @@ jobs:
       - name: 'Download KEVM results'
         if: ${{ needs.select.outputs.run_kevm == 'true' && needs.kevm.result != 'cancelled' && needs.kevm.result != 'skipped' }}
         uses: actions/download-artifact@v4
+        continue-on-error: true
         with:
           name: kevm-downstream-perf-${{ github.run_id }}
           path: downstream-perf/kevm
 
       - name: 'Download Kontrol results'
         if: ${{ needs.select.outputs.run_kontrol == 'true' && needs.kontrol.result != 'cancelled' && needs.kontrol.result != 'skipped' }}
         uses: actions/download-artifact@v4
+        continue-on-error: true
         with:
           name: kontrol-downstream-perf-${{ github.run_id }}
           path: downstream-perf/kontrol

.github/workflows/test.yml

@@ -245,6 +245,9 @@ jobs:
           fetch-depth: 0
           submodules: recursive
 
+      - name: 'Test downstream perf shell helpers'
+        run: bash scripts/test-downstream-perf-lib.sh
+
       - name: 'Install Nix'
         uses: cachix/install-nix-action@v25
         with:

scripts/downstream-perf-lib.sh

@@ -44,7 +44,7 @@ downstream_perf_write_manifest_snapshot() {
 
 downstream_perf_baseline_commit() {
     local baseline_ref=$1
-    git merge-base "$baseline_ref" HEAD
+    git rev-parse "$baseline_ref"
 }
 
 downstream_perf_run_and_log() {
@@ -55,7 +55,9 @@ downstream_perf_run_and_log() {
     start_time=$(date +%s)
 
     set +e
-    "$@" | tee "$logfile"
+    # Keep stdout reserved for machine-readable "status duration" output.
+    # Stream command output to the console via stderr while preserving a full log file.
+    "$@" 2>&1 | tee "$logfile" >&2
     status=${PIPESTATUS[0]}
     set -e
 

scripts/test-downstream-perf-lib.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
+. "$SCRIPT_DIR/downstream-perf-lib.sh"
+
+TEMPD=$(mktemp -d)
+trap 'rm -rf "$TEMPD"' EXIT
+
+LOGFILE="$TEMPD/helper.log"
+
+read -r status duration < <(
+    downstream_perf_run_and_log \
+        "$LOGFILE" \
+        bash -c "echo 'feature output line 1'; echo 'feature output line 2'; echo 'feature warning' >&2; exit 7"
+)
+
+if [[ $status != "7" ]]; then
+    echo "Expected status 7, got '$status'" >&2
+    exit 1
+fi
+
+if [[ ! $duration =~ ^[0-9]+$ ]]; then
+    echo "Expected numeric duration, got '$duration'" >&2
+    exit 1
+fi
+
+if [[ ! -s $LOGFILE ]]; then
+    echo "Expected non-empty logfile at '$LOGFILE'" >&2
+    exit 1
+fi
+
+grep -q "feature output line 1" "$LOGFILE"
+grep -q "feature output line 2" "$LOGFILE"
+grep -q "feature warning" "$LOGFILE"