Skip to content

Commit 25d9629

Browse files
TimWollaTimWolla
committed
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`
2 parents f26a691 + 874727b commit 25d9629

File tree

6 files changed

+37
-37
lines changed

6 files changed

+37
-37
lines changed

‎.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
@@ -60,7 +60,7 @@ jobs:
6060
runs-on: [self-hosted, gentoo, ppc64]
6161
steps:
6262
- name: git checkout
63-
uses: actions/checkout@v5
63+
uses: actions/checkout@v6
6464
with:
6565
ref: ${{ inputs.branch }}
6666
- name: System info
@@ -101,7 +101,7 @@ jobs:
101101
image: 'alpine:3.22'
102102
steps:
103103
- name: git checkout
104-
uses: actions/checkout@v5
104+
uses: actions/checkout@v6
105105
with:
106106
ref: ${{ inputs.branch }}
107107
- name: apk
@@ -202,7 +202,7 @@ jobs:
202202
runs-on: ubuntu-${{ matrix.asan && inputs.asan_ubuntu_version || inputs.ubuntu_version }}
203203
steps:
204204
- name: git checkout
205-
uses: actions/checkout@v5
205+
uses: actions/checkout@v6
206206
with:
207207
ref: ${{ inputs.branch }}
208208
- name: Create MSSQL container
@@ -297,7 +297,7 @@ jobs:
297297
FIREBIRD_PASSWORD: test
298298
steps:
299299
- name: git checkout
300-
uses: actions/checkout@v5
300+
uses: actions/checkout@v6
301301
with:
302302
ref: ${{ inputs.branch }}
303303
- name: apt
@@ -360,7 +360,7 @@ jobs:
360360
runs-on: macos-${{ matrix.arch == 'X64' && '15-intel' || inputs.macos_arm64_version }}
361361
steps:
362362
- name: git checkout
363-
uses: actions/checkout@v5
363+
uses: actions/checkout@v6
364364
with:
365365
ref: ${{ inputs.branch }}
366366
- name: Update clang
@@ -432,7 +432,7 @@ jobs:
432432
runs-on: ubuntu-22.04
433433
steps:
434434
- name: git checkout
435-
uses: actions/checkout@v5
435+
uses: actions/checkout@v6
436436
with:
437437
ref: ${{ inputs.branch }}
438438
- name: Create MSSQL container
@@ -480,7 +480,7 @@ jobs:
480480
USE_TRACKED_ALLOC: 1
481481
steps:
482482
- name: git checkout
483-
uses: actions/checkout@v5
483+
uses: actions/checkout@v6
484484
with:
485485
ref: ${{ inputs.branch }}
486486
- name: apt
@@ -679,7 +679,7 @@ jobs:
679679
runs-on: ubuntu-${{ inputs.ubuntu_version }}
680680
steps:
681681
- name: git checkout
682-
uses: actions/checkout@v5
682+
uses: actions/checkout@v6
683683
with:
684684
ref: ${{ inputs.branch }}
685685
- name: Create MSSQL container
@@ -737,7 +737,7 @@ jobs:
737737
runs-on: ubuntu-${{ inputs.ubuntu_version }}
738738
steps:
739739
- name: git checkout
740-
uses: actions/checkout@v5
740+
uses: actions/checkout@v6
741741
with:
742742
ref: ${{ inputs.branch }}
743743
- name: apt
@@ -823,7 +823,7 @@ jobs:
823823
runs-on: ubuntu-${{ inputs.ubuntu_version }}
824824
steps:
825825
- name: git checkout
826-
uses: actions/checkout@v5
826+
uses: actions/checkout@v6
827827
with:
828828
ref: ${{ inputs.branch }}
829829
- name: apt
@@ -868,38 +868,38 @@ jobs:
868868
CXX: ccache g++
869869
steps:
870870
- name: git checkout PHP
871-
uses: actions/checkout@v5
871+
uses: actions/checkout@v6
872872
with:
873873
path: php
874874
ref: ${{ inputs.branch }}
875875
- name: git checkout apcu
876-
uses: actions/checkout@v5
876+
uses: actions/checkout@v6
877877
with:
878878
repository: krakjoe/apcu
879879
path: apcu
880880
- name: git checkout imagick
881-
uses: actions/checkout@v5
881+
uses: actions/checkout@v6
882882
with:
883883
repository: Imagick/imagick
884884
path: imagick
885885
- name: git checkout memcached
886-
uses: actions/checkout@v5
886+
uses: actions/checkout@v6
887887
with:
888888
repository: php-memcached-dev/php-memcached
889889
path: memcached
890890
- name: git checkout redis
891-
uses: actions/checkout@v5
891+
uses: actions/checkout@v6
892892
with:
893893
repository: phpredis/phpredis
894894
path: redis
895895
- name: git checkout xdebug
896896
if: false
897-
uses: actions/checkout@v5
897+
uses: actions/checkout@v6
898898
with:
899899
repository: xdebug/xdebug
900900
path: xdebug
901901
- name: git checkout yaml
902-
uses: actions/checkout@v5
902+
uses: actions/checkout@v6
903903
with:
904904
repository: php/pecl-file_formats-yaml
905905
path: yaml
@@ -1004,7 +1004,7 @@ jobs:
10041004
- name: git config
10051005
run: git config --global core.autocrlf false && git config --global core.eol lf
10061006
- name: git checkout
1007-
uses: actions/checkout@v5
1007+
uses: actions/checkout@v6
10081008
with:
10091009
ref: ${{ inputs.branch }}
10101010
- name: Setup
@@ -1025,7 +1025,7 @@ jobs:
10251025
timeout-minutes: 50
10261026
steps:
10271027
- name: git checkout
1028-
uses: actions/checkout@v5
1028+
uses: actions/checkout@v6
10291029
with:
10301030
ref: ${{ inputs.branch }}
10311031
- 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/real-time-benchmark.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,21 +118,21 @@ jobs:
118118
sudo apt-get update -y
119119
sudo apt-get install -y terraform=1.5.7-*
120120
- name: Checkout benchmark suite
121-
uses: actions/checkout@v5
121+
uses: actions/checkout@v6
122122
with:
123123
repository: 'kocsismate/php-version-benchmarks'
124124
ref: 'main'
125125
fetch-depth: 1
126126
path: 'php-version-benchmarks'
127127
- name: Checkout php-src (benchmarked version)
128-
uses: actions/checkout@v5
128+
uses: actions/checkout@v6
129129
with:
130130
repository: '${{ env.REPOSITORY }}'
131131
ref: '${{ env.COMMIT }}'
132132
fetch-depth: 100
133133
path: 'php-version-benchmarks/tmp/php_${{ env.ID }}'
134134
- name: Checkout php-src (baseline version)
135-
uses: actions/checkout@v5
135+
uses: actions/checkout@v6
136136
with:
137137
repository: '${{ env.REPOSITORY }}'
138138
ref: '${{ env.BASELINE_COMMIT }}'
@@ -146,7 +146,7 @@ jobs:
146146
rm -rf ./php-version-benchmarks/docs/results
147147
- name: Checkout benchmark data
148148
if: github.event_name != 'workflow_dispatch'
149-
uses: actions/checkout@v5
149+
uses: actions/checkout@v6
150150
with:
151151
repository: php/real-time-benchmark-data
152152
ssh-key: ${{ secrets.PHP_VERSION_BENCHMARK_RESULTS_DEPLOY_KEY }}
@@ -290,7 +290,7 @@ jobs:
290290
git push
291291
- name: Upload artifact
292292
if: github.event_name == 'workflow_dispatch'
293-
uses: actions/upload-artifact@v4
293+
uses: actions/upload-artifact@v6
294294
with:
295295
name: results
296296
path: ./php-version-benchmarks/docs/results/${{ env.YEAR }}

‎.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)