Commit 1c81973458f for php.net
commit 1c81973458f7aa9a0cc096d7e304309fb1c0879c
Merge: 74b8fdb95b1 9338ac07438
Author: Daniel Scherzer <daniel.e.scherzer@gmail.com>
Date: Tue Jan 27 02:08:38 2026 -0800
Merge branch 'PHP-8.5'
* PHP-8.5:
GitHub actions: drop more 8.1 CI configuration (#20763)
diff --cc .github/workflows/nightly.yml
index 8d267c615c1,cf6a9446d7c..5c5af96c968
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@@ -11,12 -11,6 +11,9 @@@ on
community_verify_type_inference:
required: true
type: boolean
- libmysqlclient_with_mysqli:
- required: true
- type: boolean
+ macos_arm64_version:
+ required: true
+ type: string
run_alpine:
required: true
type: boolean
diff --cc .github/workflows/root.yml
index 123ccc17c61,6958a9cd414..8302175d638
--- a/.github/workflows/root.yml
+++ b/.github/workflows/root.yml
@@@ -46,8 -46,6 +46,7 @@@ jobs
|| '22.04' }}
branch: ${{ matrix.branch.ref }}
community_verify_type_inference: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
- libmysqlclient_with_mysqli: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1) }}
+ macos_arm64_version: ${{ ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 5) || matrix.branch.version[0] >= 9) && '15' || '14' }}
run_alpine: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
run_linux_ppc64: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}
run_macos_arm64: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9 }}