php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.5'

Browse Source 
* PHP-8.5:
  Fix nightly ref name
This commit is contained in:
Ilija Tovilo
2026-02-19 11:49:31 +01:00
parent 78c64aadad 1b5c5e0e26
commit c891263900
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.github/matrix.php vendored
View File

@@ -1,11 +1,11 @@
<?php
const BRANCHES = [
['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]],
['name' => 'master', 'ref' => 'master', 'version' => [8, 6]],
['name' => 'PHP-8.5', 'ref' => 'PHP-8.5', 'version' => [8, 5]],
['name' => 'PHP-8.4', 'ref' => 'PHP-8.4', 'version' => [8, 4]],
['name' => 'PHP-8.3', 'ref' => 'PHP-8.3', 'version' => [8, 3]],
['name' => 'PHP-8.2', 'ref' => 'PHP-8.2', 'version' => [8, 2]],
];
function get_branch_commit_cache_file_path(): string {
@@ -81,7 +81,7 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
: ['type' => ['asan']];
$jobs['COMMUNITY']['config']['symfony_version'] = version_compare($php_version, '8.4', '>=') ? '8.1' : '7.4';
}
if (($all_jobs && $ref === 'refs/heads/master') || $test_coverage) {
if (($all_jobs && $ref === 'master') || $test_coverage) {
$jobs['COVERAGE'] = true;
}
if ($all_jobs || $test_libmysqlclient) {
@@ -129,7 +129,7 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
if ($all_jobs || $test_opcache_variation) {
$jobs['OPCACHE_VARIATION'] = true;
}
if (($all_jobs && $ref === 'refs/heads/master') || $test_pecl) {
if (($all_jobs && $ref === 'master') || $test_pecl) {
$jobs['PECL'] = true;
}
if ($all_jobs || !$no_jobs || $test_windows) {
@@ -160,9 +160,9 @@ $discard_cache = $sunday
if ($discard_cache) {
@unlink(get_branch_commit_cache_file_path());
}
$branch = $argv[3] ?? 'refs/heads/master';
$branch = $argv[3] ?? 'master';
$nightly = $trigger === 'schedule' || $trigger === 'workflow_dispatch';
$branches = $nightly && $branch === 'refs/heads/master'
$branches = $nightly && $branch === 'master'
? get_branches()
: [['name' => 'Suite', 'ref' => $branch, 'version' => get_current_version()]];

2
.github/workflows/test.yml vendored
View File

@@ -59,7 +59,7 @@ jobs:
nightly-
- name: Generate Matrix
id: set-matrix
run: php .github/matrix.php "${{ github.event_name }}" "${{ github.run_attempt }}" "${{ github.ref }}" '${{ toJSON(github.event.pull_request.labels) }}' "${{ github.repository }}"
run: php .github/matrix.php "${{ github.event_name }}" "${{ github.run_attempt }}" "${{ github.event_name == 'pull_request' && github.ref || github.ref_name }}" '${{ toJSON(github.event.pull_request.labels) }}' "${{ github.repository }}"
TEST:
needs: GENERATE_MATRIX
name: ${{ matrix.branch.name }}