Skip to content

Commit 1b0652f

Browse files
committed
Merge branch 'PHP-8.5'
* PHP-8.5: Rename nightly_matrix.php to matrix.php
2 parents 33c7b1c + 480d46c commit 1b0652f

File tree

3 files changed

+2
-2
lines changed

3 files changed

+2
-2
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
nightly-
6060
- name: Generate Matrix
6161
id: set-matrix
62-
run: php .github/nightly_matrix.php "${{ github.event_name }}" "${{ github.run_attempt }}" "${{ github.ref }}" '${{ toJSON(github.event.pull_request.labels) }}' "${{ github.repository }}"
62+
run: php .github/matrix.php "${{ github.event_name }}" "${{ github.run_attempt }}" "${{ github.ref }}" '${{ toJSON(github.event.pull_request.labels) }}' "${{ github.repository }}"
6363
PUSH:
6464
needs: GENERATE_MATRIX
6565
name: ${{ matrix.branch.name }}

docs/release-process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@ feature development that cannot go into the new version.
983983
applicable files there to reflect the branch cut, and then upmerge that commit
984984
5 times to get it to `master`. The following files need to be updated:
985985
986-
* `.github/nightly_matrix.php` (add new branch, update version for `master`)
986+
* `.github/matrix.php` (add new branch, update version for `master`)
987987
[Updating after 8.5 branch cut](https://github.com/php/php-src/commit/197921a8aa7b2f9af103b439bf913e23d6ed1b98)
988988
989989
* `.github/scripts/windows/find-target-branch.bat` (update version for `master`)

0 commit comments

Comments
 (0)