Skip to content

Commit 1db177b

Browse files
TimWollaTimWolla
committed
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`
2 parents 3716dff + eb1c017 commit 1db177b

5 files changed

Lines changed: 32 additions & 32 deletions

File tree

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
if: github.repository == 'php/php-src'
1818
steps:
1919
- name: git checkout
20-
uses: actions/checkout@v5
20+
uses: actions/checkout@v6
2121
- name: Install dependencies
2222
run: pip install -r docs/requirements.txt
2323
- name: Check formatting

‎.github/workflows/labeler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ jobs:
1212
pull-requests: write
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/labeler@v5
15+
- uses: actions/labeler@v6
1616
with:
1717
repo-token: "${{ secrets.GITHUB_TOKEN }}"

‎.github/workflows/nightly.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
runs-on: [self-hosted, gentoo, ppc64]
5858
steps:
5959
- name: git checkout
60-
uses: actions/checkout@v5
60+
uses: actions/checkout@v6
6161
with:
6262
ref: ${{ inputs.branch }}
6363
- name: System info
@@ -98,7 +98,7 @@ jobs:
9898
image: 'alpine:3.22'
9999
steps:
100100
- name: git checkout
101-
uses: actions/checkout@v5
101+
uses: actions/checkout@v6
102102
with:
103103
ref: ${{ inputs.branch }}
104104
- name: apk
@@ -199,7 +199,7 @@ jobs:
199199
runs-on: ubuntu-${{ matrix.asan && inputs.asan_ubuntu_version || inputs.ubuntu_version }}
200200
steps:
201201
- name: git checkout
202-
uses: actions/checkout@v5
202+
uses: actions/checkout@v6
203203
with:
204204
ref: ${{ inputs.branch }}
205205
- name: Create MSSQL container
@@ -294,7 +294,7 @@ jobs:
294294
FIREBIRD_PASSWORD: test
295295
steps:
296296
- name: git checkout
297-
uses: actions/checkout@v5
297+
uses: actions/checkout@v6
298298
with:
299299
ref: ${{ inputs.branch }}
300300
- name: apt
@@ -357,7 +357,7 @@ jobs:
357357
runs-on: macos-${{ matrix.os }}
358358
steps:
359359
- name: git checkout
360-
uses: actions/checkout@v5
360+
uses: actions/checkout@v6
361361
with:
362362
ref: ${{ inputs.branch }}
363363
- name: Update clang
@@ -429,7 +429,7 @@ jobs:
429429
runs-on: ubuntu-22.04
430430
steps:
431431
- name: git checkout
432-
uses: actions/checkout@v5
432+
uses: actions/checkout@v6
433433
with:
434434
ref: ${{ inputs.branch }}
435435
- name: Create MSSQL container
@@ -477,7 +477,7 @@ jobs:
477477
USE_TRACKED_ALLOC: 1
478478
steps:
479479
- name: git checkout
480-
uses: actions/checkout@v5
480+
uses: actions/checkout@v6
481481
with:
482482
ref: ${{ inputs.branch }}
483483
- name: apt
@@ -676,7 +676,7 @@ jobs:
676676
runs-on: ubuntu-${{ inputs.ubuntu_version }}
677677
steps:
678678
- name: git checkout
679-
uses: actions/checkout@v5
679+
uses: actions/checkout@v6
680680
with:
681681
ref: ${{ inputs.branch }}
682682
- name: Create MSSQL container
@@ -734,7 +734,7 @@ jobs:
734734
runs-on: ubuntu-${{ inputs.ubuntu_version }}
735735
steps:
736736
- name: git checkout
737-
uses: actions/checkout@v5
737+
uses: actions/checkout@v6
738738
with:
739739
ref: ${{ inputs.branch }}
740740
- name: apt
@@ -820,7 +820,7 @@ jobs:
820820
runs-on: ubuntu-${{ inputs.ubuntu_version }}
821821
steps:
822822
- name: git checkout
823-
uses: actions/checkout@v5
823+
uses: actions/checkout@v6
824824
with:
825825
ref: ${{ inputs.branch }}
826826
- name: apt
@@ -865,38 +865,38 @@ jobs:
865865
CXX: ccache g++
866866
steps:
867867
- name: git checkout PHP
868-
uses: actions/checkout@v5
868+
uses: actions/checkout@v6
869869
with:
870870
path: php
871871
ref: ${{ inputs.branch }}
872872
- name: git checkout apcu
873-
uses: actions/checkout@v5
873+
uses: actions/checkout@v6
874874
with:
875875
repository: krakjoe/apcu
876876
path: apcu
877877
- name: git checkout imagick
878-
uses: actions/checkout@v5
878+
uses: actions/checkout@v6
879879
with:
880880
repository: Imagick/imagick
881881
path: imagick
882882
- name: git checkout memcached
883-
uses: actions/checkout@v5
883+
uses: actions/checkout@v6
884884
with:
885885
repository: php-memcached-dev/php-memcached
886886
path: memcached
887887
- name: git checkout redis
888-
uses: actions/checkout@v5
888+
uses: actions/checkout@v6
889889
with:
890890
repository: phpredis/phpredis
891891
path: redis
892892
- name: git checkout xdebug
893893
if: false
894-
uses: actions/checkout@v5
894+
uses: actions/checkout@v6
895895
with:
896896
repository: xdebug/xdebug
897897
path: xdebug
898898
- name: git checkout yaml
899-
uses: actions/checkout@v5
899+
uses: actions/checkout@v6
900900
with:
901901
repository: php/pecl-file_formats-yaml
902902
path: yaml
@@ -1001,7 +1001,7 @@ jobs:
10011001
- name: git config
10021002
run: git config --global core.autocrlf false && git config --global core.eol lf
10031003
- name: git checkout
1004-
uses: actions/checkout@v5
1004+
uses: actions/checkout@v6
10051005
with:
10061006
ref: ${{ inputs.branch }}
10071007
- name: Setup
@@ -1022,7 +1022,7 @@ jobs:
10221022
timeout-minutes: 50
10231023
steps:
10241024
- name: git checkout
1025-
uses: actions/checkout@v5
1025+
uses: actions/checkout@v6
10261026
with:
10271027
ref: ${{ inputs.branch }}
10281028
- name: FreeBSD

‎.github/workflows/push.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
image: 'alpine:3.22'
4141
steps:
4242
- name: git checkout
43-
uses: actions/checkout@v5
43+
uses: actions/checkout@v6
4444
- name: apk
4545
uses: ./.github/actions/apk
4646
- name: System info
@@ -115,7 +115,7 @@ jobs:
115115
timeout-minutes: 50
116116
steps:
117117
- name: git checkout
118-
uses: actions/checkout@v5
118+
uses: actions/checkout@v6
119119
- name: apt
120120
uses: ./.github/actions/apt-x64
121121
- name: System info
@@ -200,7 +200,7 @@ jobs:
200200
FIREBIRD_PASSWORD: test
201201
steps:
202202
- name: git checkout
203-
uses: actions/checkout@v5
203+
uses: actions/checkout@v6
204204
- name: apt
205205
uses: ./.github/actions/apt-x32
206206
- name: ccache
@@ -238,7 +238,7 @@ jobs:
238238
timeout-minutes: 50
239239
steps:
240240
- name: git checkout
241-
uses: actions/checkout@v5
241+
uses: actions/checkout@v6
242242
- name: Update clang
243243
uses: ./.github/actions/macos-update-clang
244244
- name: brew
@@ -287,7 +287,7 @@ jobs:
287287
- name: git config
288288
run: git config --global core.autocrlf false && git config --global core.eol lf
289289
- name: git checkout
290-
uses: actions/checkout@v5
290+
uses: actions/checkout@v6
291291
- name: Setup
292292
uses: ./.github/actions/setup-windows
293293
- name: Build
@@ -301,7 +301,7 @@ jobs:
301301
timeout-minutes: 50
302302
steps:
303303
- name: git checkout
304-
uses: actions/checkout@v5
304+
uses: actions/checkout@v6
305305
with:
306306
fetch-depth: 0
307307
# ASLR can cause a lot of noise due to missed sse opportunities for memcpy
@@ -363,7 +363,7 @@ jobs:
363363
mysql -uroot -proot -e "CREATE USER 'wordpress'@'localhost' IDENTIFIED BY 'wordpress'; FLUSH PRIVILEGES;"
364364
mysql -uroot -proot -e "GRANT ALL PRIVILEGES ON *.* TO 'wordpress'@'localhost' WITH GRANT OPTION;"
365365
- name: git checkout benchmarking-data
366-
uses: actions/checkout@v5
366+
uses: actions/checkout@v6
367367
with:
368368
repository: php/benchmarking-data
369369
ssh-key: ${{ secrets.BENCHMARKING_DATA_DEPLOY_KEY }}
@@ -394,7 +394,7 @@ jobs:
394394
${{ github.sha }} \
395395
$(git merge-base ${{ github.event.pull_request.base.sha }} ${{ github.sha }}) \
396396
> $GITHUB_STEP_SUMMARY
397-
- uses: actions/upload-artifact@v4
397+
- uses: actions/upload-artifact@v6
398398
with:
399399
name: profiles
400400
path: ${{ github.workspace }}/benchmark/profiles
@@ -406,6 +406,6 @@ jobs:
406406
timeout-minutes: 50
407407
steps:
408408
- name: git checkout
409-
uses: actions/checkout@v5
409+
uses: actions/checkout@v6
410410
- name: FreeBSD
411411
uses: ./.github/actions/freebsd

‎.github/workflows/root.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
outputs:
1414
branches: ${{ steps.set-matrix.outputs.branches }}
1515
steps:
16-
- uses: actions/checkout@v5
16+
- uses: actions/checkout@v6
1717
with:
1818
# Set fetch-depth to 0 to clone the full repository
1919
# including all branches. This is required to find
2020
# the correct commit hashes.
2121
fetch-depth: 0
2222
- name: Grab the commit mapping
23-
uses: actions/cache@v4
23+
uses: actions/cache@v5
2424
with:
2525
path: branch-commit-cache.json
2626
# The cache key needs to change every time for the

0 commit comments

Comments
 (0)