Skip to content

Commit d076ca3

Browse files
TimWollaTimWolla
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: 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 d92fa57 + 61c3592 commit d076ca3

File tree

3 files changed

+26
-26
lines changed

3 files changed

+26
-26
lines changed

‎.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
@@ -200,7 +200,7 @@ jobs:
200200
runs-on: ubuntu-${{ matrix.asan && inputs.asan_ubuntu_version || inputs.ubuntu_version }}
201201
steps:
202202
- name: git checkout
203-
uses: actions/checkout@v5
203+
uses: actions/checkout@v6
204204
with:
205205
ref: ${{ inputs.branch }}
206206
- name: Create MSSQL container
@@ -298,7 +298,7 @@ jobs:
298298
FIREBIRD_PASSWORD: test
299299
steps:
300300
- name: git checkout
301-
uses: actions/checkout@v5
301+
uses: actions/checkout@v6
302302
with:
303303
ref: ${{ inputs.branch }}
304304
- name: apt
@@ -364,7 +364,7 @@ jobs:
364364
runs-on: macos-${{ matrix.os }}
365365
steps:
366366
- name: git checkout
367-
uses: actions/checkout@v5
367+
uses: actions/checkout@v6
368368
with:
369369
ref: ${{ inputs.branch }}
370370
- name: Update clang
@@ -439,7 +439,7 @@ jobs:
439439
runs-on: ubuntu-22.04
440440
steps:
441441
- name: git checkout
442-
uses: actions/checkout@v5
442+
uses: actions/checkout@v6
443443
with:
444444
ref: ${{ inputs.branch }}
445445
- name: Create MSSQL container
@@ -488,7 +488,7 @@ jobs:
488488
USE_TRACKED_ALLOC: 1
489489
steps:
490490
- name: git checkout
491-
uses: actions/checkout@v5
491+
uses: actions/checkout@v6
492492
with:
493493
ref: ${{ inputs.branch }}
494494
- name: apt
@@ -688,7 +688,7 @@ jobs:
688688
runs-on: ubuntu-${{ inputs.ubuntu_version }}
689689
steps:
690690
- name: git checkout
691-
uses: actions/checkout@v5
691+
uses: actions/checkout@v6
692692
with:
693693
ref: ${{ inputs.branch }}
694694
- name: Create MSSQL container
@@ -751,7 +751,7 @@ jobs:
751751
runs-on: ubuntu-${{ inputs.ubuntu_version }}
752752
steps:
753753
- name: git checkout
754-
uses: actions/checkout@v5
754+
uses: actions/checkout@v6
755755
with:
756756
ref: ${{ inputs.branch }}
757757
- name: apt
@@ -838,7 +838,7 @@ jobs:
838838
runs-on: ubuntu-${{ inputs.ubuntu_version }}
839839
steps:
840840
- name: git checkout
841-
uses: actions/checkout@v5
841+
uses: actions/checkout@v6
842842
with:
843843
ref: ${{ inputs.branch }}
844844
- name: apt
@@ -883,38 +883,38 @@ jobs:
883883
CXX: ccache g++
884884
steps:
885885
- name: git checkout PHP
886-
uses: actions/checkout@v5
886+
uses: actions/checkout@v6
887887
with:
888888
path: php
889889
ref: ${{ inputs.branch }}
890890
- name: git checkout apcu
891-
uses: actions/checkout@v5
891+
uses: actions/checkout@v6
892892
with:
893893
repository: krakjoe/apcu
894894
path: apcu
895895
- name: git checkout imagick
896-
uses: actions/checkout@v5
896+
uses: actions/checkout@v6
897897
with:
898898
repository: Imagick/imagick
899899
path: imagick
900900
- name: git checkout memcached
901-
uses: actions/checkout@v5
901+
uses: actions/checkout@v6
902902
with:
903903
repository: php-memcached-dev/php-memcached
904904
path: memcached
905905
- name: git checkout redis
906-
uses: actions/checkout@v5
906+
uses: actions/checkout@v6
907907
with:
908908
repository: phpredis/phpredis
909909
path: redis
910910
- name: git checkout xdebug
911911
if: false
912-
uses: actions/checkout@v5
912+
uses: actions/checkout@v6
913913
with:
914914
repository: xdebug/xdebug
915915
path: xdebug
916916
- name: git checkout yaml
917-
uses: actions/checkout@v5
917+
uses: actions/checkout@v6
918918
with:
919919
repository: php/pecl-file_formats-yaml
920920
path: yaml
@@ -1019,7 +1019,7 @@ jobs:
10191019
- name: git config
10201020
run: git config --global core.autocrlf false && git config --global core.eol lf
10211021
- name: git checkout
1022-
uses: actions/checkout@v5
1022+
uses: actions/checkout@v6
10231023
with:
10241024
ref: ${{ inputs.branch }}
10251025
- name: Setup
@@ -1040,7 +1040,7 @@ jobs:
10401040
timeout-minutes: 50
10411041
steps:
10421042
- name: git checkout
1043-
uses: actions/checkout@v5
1043+
uses: actions/checkout@v6
10441044
with:
10451045
ref: ${{ inputs.branch }}
10461046
- name: FreeBSD

‎.github/workflows/push.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
runs-on: ubuntu-${{ !matrix.asan && '22' || '24' }}.04
7878
steps:
7979
- name: git checkout
80-
uses: actions/checkout@v5
80+
uses: actions/checkout@v6
8181
- name: apt
8282
uses: ./.github/actions/apt-x64
8383
- name: System info
@@ -154,7 +154,7 @@ jobs:
154154
MYSQL_ROOT_PASSWORD: root
155155
steps:
156156
- name: git checkout
157-
uses: actions/checkout@v5
157+
uses: actions/checkout@v6
158158
- name: apt
159159
uses: ./.github/actions/apt-x32
160160
- name: ccache
@@ -185,7 +185,7 @@ jobs:
185185
runs-on: macos-14
186186
steps:
187187
- name: git checkout
188-
uses: actions/checkout@v5
188+
uses: actions/checkout@v6
189189
- name: Update clang
190190
uses: ./.github/actions/macos-update-clang
191191
- name: brew
@@ -235,7 +235,7 @@ jobs:
235235
- name: git config
236236
run: git config --global core.autocrlf false && git config --global core.eol lf
237237
- name: git checkout
238-
uses: actions/checkout@v5
238+
uses: actions/checkout@v6
239239
- name: Setup
240240
uses: ./.github/actions/setup-windows
241241
- name: Build
@@ -346,6 +346,6 @@ jobs:
346346
timeout-minutes: 50
347347
steps:
348348
- name: git checkout
349-
uses: actions/checkout@v5
349+
uses: actions/checkout@v6
350350
- name: FreeBSD
351351
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)