1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
  Backport nightly.yml and nightly_matrix.php to PHP-8.1
This commit is contained in:
Ilija Tovilo
2024-10-29 15:34:18 +01:00
2 changed files with 8 additions and 6 deletions

View File

@@ -1,7 +1,8 @@
<?php
const BRANCHES = [
['name' => 'master', 'ref' => 'master', 'version' => ['major' => 8, 'minor' => 4]],
['name' => 'master', 'ref' => 'master', 'version' => ['major' => 8, 'minor' => 5]],
['name' => 'PHP-8.4', 'ref' => 'PHP-8.4', 'version' => ['major' => 8, 'minor' => 4]],
['name' => 'PHP-8.3', 'ref' => 'PHP-8.3', 'version' => ['major' => 8, 'minor' => 3]],
['name' => 'PHP-8.2', 'ref' => 'PHP-8.2', 'version' => ['major' => 8, 'minor' => 2]],
['name' => 'PHP-8.1', 'ref' => 'PHP-8.1', 'version' => ['major' => 8, 'minor' => 1]],
@@ -153,7 +154,10 @@ function get_current_version(): array {
$trigger = $argv[1] ?? 'schedule';
$attempt = (int) ($argv[2] ?? 1);
$discard_cache = ($trigger === 'schedule' && $attempt !== 1) || $trigger === 'workflow_dispatch';
$monday = date('w', time()) === '1';
$discard_cache = $monday
|| ($trigger === 'schedule' && $attempt !== 1)
|| $trigger === 'workflow_dispatch';
if ($discard_cache) {
@unlink(get_branch_commit_cache_file_path());
}

View File

@@ -873,13 +873,12 @@ jobs:
repository: php-memcached-dev/php-memcached
path: memcached
- name: git checkout redis
# Currently fails to build
if: false
uses: actions/checkout@v4
with:
repository: phpredis/phpredis
path: redis
- name: git checkout xdebug
if: false
uses: actions/checkout@v4
with:
repository: xdebug/xdebug
@@ -935,14 +934,13 @@ jobs:
./configure --prefix=/opt/php --with-php-config=/opt/php/bin/php-config
make -j$(/usr/bin/nproc)
- name: build redis
# Currently fails to build
if: false
run: |
cd redis
/opt/php/bin/phpize
./configure --prefix=/opt/php --with-php-config=/opt/php/bin/php-config
make -j$(/usr/bin/nproc)
- name: build xdebug
if: false
run: |
cd xdebug
/opt/php/bin/phpize