[CI] Fix benchmarking HEAD sha consistently

Author: iluuu1994

.github/workflows/test-suite.yml

@@ -1051,8 +1051,11 @@ jobs:
           repository: php/benchmarking-data
           ssh-key: ${{ secrets.BENCHMARKING_DATA_DEPLOY_KEY }}
           path: benchmark/repos/data
+      - name: HEAD commit
+        id: head_commit
+        run: echo "sha=${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}" >> $GITHUB_OUTPUT
       - name: Benchmark
-        run: php benchmark/benchmark.php true
+        run: php benchmark/benchmark.php ${{ steps.head_commit.outputs.sha }} true
       - name: Store result
         if: github.event_name == 'push'
         run: |
@@ -1067,15 +1070,15 @@ jobs:
           if git diff --cached --quiet; then
             exit 0
           fi
-          git commit -m "Add result for ${{ github.repository }}@${{ github.sha }}"
+          git commit -m "Add result for ${{ github.repository }}@${{ steps.head_commit.outputs.sha }}"
           git push
       - name: Show diff
         if: github.event_name == 'pull_request'
         run: |-
           set -x
           php benchmark/generate_diff.php \
-            ${{ github.event.pull_request.head.sha }} \
-            $(git merge-base ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }}) \
+            ${{ steps.head_commit.outputs.sha }} \
+            $(git merge-base ${{ github.event.pull_request.base.sha }} ${{ steps.head_commit.outputs.sha }}) \
             > $GITHUB_STEP_SUMMARY
       - uses: actions/upload-artifact@v6
         with:

benchmark/benchmark.php

@@ -8,8 +8,13 @@
     }
 }
 
-$storeResult = ($argv[1] ?? 'false') === 'true';
-$phpCgi = $argv[2] ?? dirname(PHP_BINARY) . '/php-cgi';
+$commitHash = $argv[1] ?? '';
+if ($commitHash === '') {
+    fwrite(STDERR, "Commit hash required\n");
+    exit(1);
+}
+$storeResult = ($argv[2] ?? 'false') === 'true';
+$phpCgi = $argv[3] ?? dirname(PHP_BINARY) . '/php-cgi';
 if (!file_exists($phpCgi)) {
     fwrite(STDERR, "php-cgi not found\n");
     exit(1);
@@ -43,10 +48,11 @@ function main() {
 }
 
 function storeResult(string $result) {
+    global $commitHash;
+
     $repo = __DIR__ . '/repos/data';
     cloneRepo($repo, 'git@github.com:php/benchmarking-data.git');
 
-    $commitHash = getPhpSrcCommitHash();
     $dir = $repo . '/' . substr($commitHash, 0, 2) . '/' . $commitHash;
     $summaryFile = $dir . '/summary.json';
     if (!is_dir($dir)) {
@@ -55,11 +61,6 @@ function storeResult(string $result) {
     file_put_contents($summaryFile, $result);
 }
 
-function getPhpSrcCommitHash(): string {
-    $result = runCommand(['git', 'log', '--pretty=format:%H', '-n', '1'], dirname(__DIR__));
-    return $result->stdout;
-}
-
 function runBench(bool $jit): array {
     return runValgrindPhpCgiCommand('bench', [dirname(__DIR__) . '/Zend/bench.php'], jit: $jit);
 }