Commit 25d9629c5a9 for php.net

commit 25d9629c5a9cf930ac1f1ee8436b2501dd32a054
Merge: f26a69164cc 874727b41f3
Author: Tim Düsterhus <tim@tideways-gmbh.com>
Date:   Wed Dec 17 15:31:40 2025 +0100

    Merge branch 'PHP-8.5'

    * PHP-8.5:
      Update GitHub Action workflows to `actions/upload-artifact@v6` (8.5)
      Update GitHub Action workflows to `actions/checkout@v6` (8.5)
      Update GitHub Action workflows to `actions/upload-artifact@v6`
      Update GitHub Action workflows to `actions/labeler@v6`
      Update GitHub Action workflows to `actions/checkout@v6` (8.4)
      Update GitHub Action workflows to `actions/checkout@v6` (8.3)
      Update GitHub Action workflows to `actions/checkout@v6` (8.2)
      Update GitHub Action workflows to `actions/cache@v5`
      Update GitHub Action workflows to `actions/checkout@v6`

diff --cc .github/workflows/nightly.yml
index 48628896f49,ae9b147e938..9ab95da2d93
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@@ -353,14 -350,14 +353,14 @@@ jobs
        matrix:
          debug: [true, false]
          zts: [true, false]
 -        os: ['13', '14']
 +        arch: ['X64', 'ARM64']
          exclude:
 -          - os: ${{ !inputs.run_macos_arm64 && '14' || '*never*' }}
 -    name: "MACOS_${{ matrix.os == '13' && 'X64' || 'ARM64' }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
 -    runs-on: macos-${{ matrix.os }}
 +          - arch: ${{ !inputs.run_macos_arm64 && 'ARM64' || '*never*' }}
 +    name: "MACOS_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
 +    runs-on: macos-${{ matrix.arch == 'X64' && '15-intel' || inputs.macos_arm64_version }}
      steps:
        - name: git checkout
-         uses: actions/checkout@v5
+         uses: actions/checkout@v6
          with:
            ref: ${{ inputs.branch }}
        - name: Update clang