Skip to content

Commit ef56241

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Backport nightly.yml and nightly_matrix.php to PHP-8.1
2 parents 6a0035b + fe93cd4 commit ef56241

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.github/nightly_matrix.php

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?php
22

33
const BRANCHES = [
4-
['name' => 'master', 'ref' => 'master', 'version' => ['major' => 8, 'minor' => 4]],
4+
['name' => 'master', 'ref' => 'master', 'version' => ['major' => 8, 'minor' => 5]],
5+
['name' => 'PHP-8.4', 'ref' => 'PHP-8.4', 'version' => ['major' => 8, 'minor' => 4]],
56
['name' => 'PHP-8.3', 'ref' => 'PHP-8.3', 'version' => ['major' => 8, 'minor' => 3]],
67
['name' => 'PHP-8.2', 'ref' => 'PHP-8.2', 'version' => ['major' => 8, 'minor' => 2]],
78
['name' => 'PHP-8.1', 'ref' => 'PHP-8.1', 'version' => ['major' => 8, 'minor' => 1]],
@@ -153,7 +154,10 @@ function get_current_version(): array {
153154

154155
$trigger = $argv[1] ?? 'schedule';
155156
$attempt = (int) ($argv[2] ?? 1);
156-
$discard_cache = ($trigger === 'schedule' && $attempt !== 1) || $trigger === 'workflow_dispatch';
157+
$monday = date('w', time()) === '1';
158+
$discard_cache = $monday
159+
|| ($trigger === 'schedule' && $attempt !== 1)
160+
|| $trigger === 'workflow_dispatch';
157161
if ($discard_cache) {
158162
@unlink(get_branch_commit_cache_file_path());
159163
}

.github/workflows/nightly.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -873,13 +873,12 @@ jobs:
873873
repository: php-memcached-dev/php-memcached
874874
path: memcached
875875
- name: git checkout redis
876-
# Currently fails to build
877-
if: false
878876
uses: actions/checkout@v4
879877
with:
880878
repository: phpredis/phpredis
881879
path: redis
882880
- name: git checkout xdebug
881+
if: false
883882
uses: actions/checkout@v4
884883
with:
885884
repository: xdebug/xdebug
@@ -935,14 +934,13 @@ jobs:
935934
./configure --prefix=/opt/php --with-php-config=/opt/php/bin/php-config
936935
make -j$(/usr/bin/nproc)
937936
- name: build redis
938-
# Currently fails to build
939-
if: false
940937
run: |
941938
cd redis
942939
/opt/php/bin/phpize
943940
./configure --prefix=/opt/php --with-php-config=/opt/php/bin/php-config
944941
make -j$(/usr/bin/nproc)
945942
- name: build xdebug
943+
if: false
946944
run: |
947945
cd xdebug
948946
/opt/php/bin/phpize

0 commit comments

Comments
 (0)