Fix issues

Author: iluuu1994

.github/workflows/push.yml

@@ -223,6 +223,12 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
+      - name: git checkout benchmarking-data
+        uses: actions/checkout@v3
+        with:
+          repository: iluuu1994/php-benchmark-data
+          ssh-key: ${{ secrets.BENCHMARK_DATA_DEPLOY_KEY }}
+          path: benchmark/repos/data
       - name: apt
         run: |
           set -x
@@ -263,15 +269,10 @@ jobs:
         run: make -j$(/usr/bin/nproc) >/dev/null
       - name: make install
         uses: ./.github/actions/install-linux
-      - name: Prepare SSH key
+      - name: Setup
         run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.BENCHMARK_DATA_DEPLOY_KEY }}" > ~/.ssh/id_ed25519
-          chmod 600 ~/.ssh/id_ed25519
           git config --global user.name "Benchmark"
           git config --global user.email "benchmark@php.net"
-      - name: Setup
-        run: |
           sudo service mysql start
           mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS wordpress"
           mysql -uroot -proot -e "CREATE USER 'wordpress'@'localhost' IDENTIFIED BY 'wordpress'; FLUSH PRIVILEGES;"
@@ -282,6 +283,17 @@ jobs:
           echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini
       - name: Benchmark
         run: php benchmark/benchmark.php true
+      - name: Store result
+        if: github.event_name == 'push'
+        run: |
+          set -x
+          cd benchmark/repos/data
+          git add .
+          if git diff --cached --quiet; then
+            exit 0
+          fi
+          git commit -m "Add result for ${{ github.repository }}@${{ steps.determine-commit.outputs.sha }}"
+          git push
       - name: Show diff
         if: github.event_name == 'pull_request'
         run: >-

benchmark/benchmark.php

@@ -2,33 +2,32 @@
 
 require_once __DIR__ . '/shared.php';
 
-$commitResult = ($argv[1] ?? 'false') === 'true';
+$storeResult = ($argv[1] ?? 'false') === 'true';
 $phpCgi = $argv[2] ?? dirname(PHP_BINARY) . '/php-cgi';
 if (!file_exists($phpCgi)) {
     fwrite(STDERR, "php-cgi not found\n");
     exit(1);
 }
 
 function main() {
-    global $commitResult;
+    global $storeResult;
 
     $data = [];
     $data['bench.php'] = runBench();
     $data['symfony_demo'] = runSymfonyDemo();
     $data['wordpress_6.2'] = runWordpress();
     $result = json_encode($data, JSON_PRETTY_PRINT) . "\n";
 
-    if ($commitResult) {
-        commitResult($result);
-    } else {
-        fwrite(STDOUT, $result);
+    fwrite(STDOUT, $result);
+
+    if ($storeResult) {
+        storeResult($result);
     }
 }
 
-function commitResult(string $result) {
+function storeResult(string $result) {
     $repo = __DIR__ . '/repos/data';
     cloneRepo($repo, 'git@github.com:iluuu1994/php-benchmark-data.git');
-    runCommand(['git', 'pull', '--end-of-options', 'origin'], $repo);
 
     $commitHash = getPhpSrcCommitHash();
     $dir = $repo . '/' . substr($commitHash, 0, 2) . '/' . $commitHash;
@@ -37,10 +36,6 @@ function commitResult(string $result) {
         mkdir($dir, 0755, true);
     }
     file_put_contents($summaryFile, $result);
-
-    runCommand(['git', 'add', '--end-of-options', $summaryFile], $repo);
-    runCommand(['git', 'commit', '--allow-empty', '-m', 'Add result for php/php-src@' . $commitHash, '--author', 'Benchmark <benchmark@php.net>'], $repo);
-    runCommand(['git', 'push'], $repo);
 }
 
 function getPhpSrcCommitHash(): string {