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

Merge branch 'PHP-8.5'

* PHP-8.5:
  Rename nightly_matrix.php to matrix.php
This commit is contained in:
Ilija Tovilo
2026-02-18 19:52:26 +01:00
3 changed files with 2 additions and 2 deletions

View File

@@ -59,7 +59,7 @@ jobs:
nightly- nightly-
- name: Generate Matrix - name: Generate Matrix
id: set-matrix id: set-matrix
run: php .github/nightly_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.ref }}" '${{ toJSON(github.event.pull_request.labels) }}' "${{ github.repository }}"
PUSH: PUSH:
needs: GENERATE_MATRIX needs: GENERATE_MATRIX
name: ${{ matrix.branch.name }} name: ${{ matrix.branch.name }}

View File

@@ -983,7 +983,7 @@ feature development that cannot go into the new version.
applicable files there to reflect the branch cut, and then upmerge that commit applicable files there to reflect the branch cut, and then upmerge that commit
5 times to get it to `master`. The following files need to be updated: 5 times to get it to `master`. The following files need to be updated:
* `.github/nightly_matrix.php` (add new branch, update version for `master`) * `.github/matrix.php` (add new branch, update version for `master`)
[Updating after 8.5 branch cut](https://github.com/php/php-src/commit/197921a8aa7b2f9af103b439bf913e23d6ed1b98) [Updating after 8.5 branch cut](https://github.com/php/php-src/commit/197921a8aa7b2f9af103b439bf913e23d6ed1b98)
* `.github/scripts/windows/find-target-branch.bat` (update version for `master`) * `.github/scripts/windows/find-target-branch.bat` (update version for `master`)