[pull] master from php:master

.github/nightly_matrix.php → .github/matrix.php

@@ -1,11 +1,11 @@
 <?php
 
 const BRANCHES = [
-    ['ref' => 'master', 'version' => [8, 6]],
-    ['ref' => 'PHP-8.5', 'version' => [8, 5]],
-    ['ref' => 'PHP-8.4', 'version' => [8, 4]],
-    ['ref' => 'PHP-8.3', 'version' => [8, 3]],
-    ['ref' => 'PHP-8.2', 'version' => [8, 2]],
+    ['name' => 'master', 'ref' => 'refs/heads/master', 'version' => [8, 6]],
+    ['name' => 'PHP-8.5', 'ref' => 'refs/heads/PHP-8.5', 'version' => [8, 5]],
+    ['name' => 'PHP-8.4', 'ref' => 'refs/heads/PHP-8.4', 'version' => [8, 4]],
+    ['name' => 'PHP-8.3', 'ref' => 'refs/heads/PHP-8.3', 'version' => [8, 3]],
+    ['name' => 'PHP-8.2', 'ref' => 'refs/heads/PHP-8.2', 'version' => [8, 2]],
 ];
 
 function get_branch_commit_cache_file_path(): string {
@@ -46,10 +46,11 @@ function get_current_version(): array {
     return [$major, $minor];
 }
 
-function select_jobs($nightly, $labels, $php_version, $ref, $all_variations) {
+function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $ref, $all_variations) {
     $no_jobs = in_array('CI: No jobs', $labels, true);
     $all_jobs = in_array('CI: All jobs', $labels, true) || $nightly;
     $test_alpine = in_array('CI: Alpine', $labels, true);
+    $test_benchmarking = in_array('CI: Benchmarking', $labels, true);
     $test_community = in_array('CI: Community', $labels, true);
     $test_coverage = in_array('CI: COVERAGE', $labels, true);
     $test_freebsd = in_array('CI: FreeBSD', $labels, true);
@@ -67,13 +68,20 @@ function select_jobs($nightly, $labels, $php_version, $ref, $all_variations) {
     if (version_compare($php_version, '8.4', '>=') && ($all_jobs || !$no_jobs || $test_alpine)) {
         $jobs['ALPINE'] = true;
     }
+    if (version_compare($php_version, '8.4', '>=')
+        && !$nightly
+        && ($all_jobs || !$no_jobs || $test_benchmarking)
+        // push trigger is restricted to official repository.
+        && ($repository === 'php/php-src' || $trigger === 'pull_request')) {
+        $jobs['BENCHMARKING'] = true;
+    }
     if ($all_jobs || $test_community) {
         $jobs['COMMUNITY']['matrix'] = version_compare($php_version, '8.4', '>=')
             ? ['type' => ['asan', 'verify_type_inference']]
             : ['type' => ['asan']];
         $jobs['COMMUNITY']['config']['symfony_version'] = version_compare($php_version, '8.4', '>=') ? '8.1' : '7.4';
     }
-    if (($all_jobs && $ref === 'master') || $test_coverage) {
+    if (($all_jobs && $ref === 'refs/heads/master') || $test_coverage) {
         $jobs['COVERAGE'] = true;
     }
     if ($all_jobs || $test_libmysqlclient) {
@@ -121,7 +129,7 @@ function select_jobs($nightly, $labels, $php_version, $ref, $all_variations) {
     if ($all_jobs || $test_opcache_variation) {
         $jobs['OPCACHE_VARIATION'] = true;
     }
-    if (($all_jobs && $ref === 'master') || $test_pecl) {
+    if (($all_jobs && $ref === 'refs/heads/master') || $test_pecl) {
         $jobs['PECL'] = true;
     }
     if ($all_jobs || !$no_jobs || $test_windows) {
@@ -152,19 +160,21 @@ function select_jobs($nightly, $labels, $php_version, $ref, $all_variations) {
 if ($discard_cache) {
     @unlink(get_branch_commit_cache_file_path());
 }
-$branch = $argv[3] ?? 'master';
-$branches = $branch === 'master'
+$branch = $argv[3] ?? 'refs/heads/master';
+$nightly = $trigger === 'schedule' || $trigger === 'workflow_dispatch';
+$branches = $nightly && $branch === 'refs/heads/master'
     ? get_branches()
-    : [['ref' => $branch, 'version' => get_current_version()]];
+    : [['name' => 'Suite', 'ref' => $branch, 'version' => get_current_version()]];
 
 $labels = json_decode($argv[4] ?? '[]', true) ?? [];
 $labels = array_column($labels, 'name');
-$nightly = $trigger === 'schedule' || $trigger === 'workflow_dispatch';
 $all_variations = $nightly || in_array('CI: All variations', $labels, true);
 
+$repository = $argv[5] ?? null;
+
 foreach ($branches as &$branch) {
     $php_version = $branch['version'][0] . '.' . $branch['version'][1];
-    $branch['jobs'] = select_jobs($nightly, $labels, $php_version, $branch['ref'], $all_variations);
+    $branch['jobs'] = select_jobs($repository, $trigger, $nightly, $labels, $php_version, $branch['ref'], $all_variations);
     $branch['config']['ubuntu_version'] = version_compare($php_version, '8.5', '>=') ? '24.04' : '22.04';
 }
 

.github/workflows/nightly-results.yml

@@ -2,13 +2,13 @@ name: Nightly results
 on:
   workflow_run:
     workflows:
-      - Nightly
+      - Test
     types:
       - completed
 jobs:
   on-failure:
     runs-on: ubuntu-latest
-    if: ${{ github.repository == 'php/php-src' && github.event.workflow_run.conclusion == 'failure' }}
+    if: ${{ github.repository == 'php/php-src' && github.event.workflow_run.event == 'schedule' && github.event.workflow_run.conclusion == 'failure' }}
     steps:
       - run: |
           export DEBIAN_FRONTEND=noninteractive