Commit 1db177b6964 for php.net

commit 1db177b6964b192141891dc72d1e1ce21bcf6443
Merge: 3716dffcc74 eb1c0177fd6
Author: Tim Düsterhus <tim@tideways-gmbh.com>
Date:   Wed Dec 17 15:30:34 2025 +0100

    Merge branch 'PHP-8.4' into PHP-8.5

    * PHP-8.4:
      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/docs.yml
index 3e59990742c,5c1c642a856..0ab56f77ab3
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@@ -17,11 -17,11 +17,11 @@@ jobs
      if: github.repository == 'php/php-src'
      steps:
        - name: git checkout
-         uses: actions/checkout@v5
+         uses: actions/checkout@v6
        - name: Install dependencies
 -        run: pip install sphinx-design sphinxawesome-theme rstfmt
 +        run: pip install -r docs/requirements.txt
        - name: Check formatting
 -        run: rstfmt --check -w 100 docs/source
 +        run: make -C docs check-formatting
        - name: Publish
          if: github.event_name == 'push'
          uses: sphinx-notes/pages@v3
diff --cc .github/workflows/push.yml
index c84b6cd4737,ffe53afbf7c..2f9ce3c3bc7
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@@ -111,11 -119,10 +111,11 @@@ jobs
              zts: true
              asan: true
      name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}"
 -    runs-on: ubuntu-${{ !matrix.asan && '22' || '24' }}.04
 +    runs-on: ubuntu-24.04
 +    timeout-minutes: 50
      steps:
        - name: git checkout
-         uses: actions/checkout@v5
+         uses: actions/checkout@v6
        - name: apt
          uses: ./.github/actions/apt-x64
        - name: System info
@@@ -189,18 -194,9 +189,18 @@@
          env:
            MYSQL_DATABASE: test
            MYSQL_ROOT_PASSWORD: root
 +      firebird:
 +        image: jacobalberty/firebird
 +        ports:
 +          - 3050:3050
 +        env:
 +          ISC_PASSWORD: test
 +          FIREBIRD_DATABASE: test.fdb
 +          FIREBIRD_USER: test
 +          FIREBIRD_PASSWORD: test
      steps:
        - name: git checkout
-         uses: actions/checkout@v5
+         uses: actions/checkout@v6
        - name: apt
          uses: ./.github/actions/apt-x32
        - name: ccache
@@@ -235,10 -232,9 +235,10 @@@
              arch: ARM64
      name: MACOS_${{ matrix.arch }}_DEBUG_NTS
      runs-on: macos-${{ matrix.os }}
 +    timeout-minutes: 50
      steps:
        - name: git checkout
-         uses: actions/checkout@v5
+         uses: actions/checkout@v6
        - name: Update clang
          uses: ./.github/actions/macos-update-clang
        - name: brew
@@@ -297,11 -293,10 +297,11 @@@
    BENCHMARKING:
      name: BENCHMARKING
      if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
 -    runs-on: ubuntu-22.04
 +    runs-on: ubuntu-24.04
 +    timeout-minutes: 50
      steps:
        - name: git checkout
-         uses: actions/checkout@v5
+         uses: actions/checkout@v6
          with:
            fetch-depth: 0
        # ASLR can cause a lot of noise due to missed sse opportunities for memcpy