Skip to content

Commit a3cfb2b

Browse files
authored
Merge branch 'main' into dependabot/github_actions/peter-evans/find-comment-4.0.0
2 parents 3f73699 + c6da2ff commit a3cfb2b

7 files changed

Lines changed: 19 additions & 14 deletions

File tree

.github/workflows/benchmark-manual.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
steps:
4646
- name: Checkout code
47-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
47+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4848

4949
- name: Setup PHP
5050
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2

.github/workflows/benchmark-on-merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: Checkout code
21-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
21+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2222
with:
2323
ref: main
2424
fetch-depth: 0

.github/workflows/benchmark-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
fi
3939
4040
- name: Checkout PR
41-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
41+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4242
with:
4343
# Checkout the PR branch for pull_request events
4444
# For issue_comment events, checkout the PR's head
@@ -60,7 +60,7 @@ jobs:
6060
6161
- name: Checkout PR for comment trigger
6262
if: github.event_name == 'issue_comment'
63-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
63+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
6464
with:
6565
ref: ${{ steps.pr_details.outputs.head_sha }}
6666

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
13+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
1414
- name: Install dependencies
1515
uses: php-actions/composer@8a65f0d3c6a1d17ca4800491a40b5756a4c164f3 # v6
1616
with:
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
27+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2828
- name: Install dependencies
2929
uses: php-actions/composer@8a65f0d3c6a1d17ca4800491a40b5756a4c164f3 # v6
3030
with:
@@ -41,7 +41,7 @@ jobs:
4141
runs-on: ${{ matrix.os }}
4242
steps:
4343
- name: Checkout
44-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
44+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4545
- name: Setup PHP
4646
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2
4747
with:
@@ -63,7 +63,7 @@ jobs:
6363
runs-on: ubuntu-latest
6464
steps:
6565
- name: Checkout
66-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
66+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
6767
- name: Setup PHP
6868
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2
6969
with:
@@ -85,9 +85,9 @@ jobs:
8585
runs-on: ubuntu-latest
8686
steps:
8787
- name: Checkout
88-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
88+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
8989
- name: Checkout php-src repository
90-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
90+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
9191
with:
9292
repository: php/php-src
9393
path: php-src

.github/workflows/claude-code-review.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ jobs:
1616
# the actions/checkout SHA), which makes claude-code-action's OIDC token exchange
1717
# fail with "Workflow validation failed" because the workflow no longer matches the
1818
# version on the default branch. Skipping avoids that expected, unavoidable failure.
19-
if: github.actor != 'dependabot[bot]'
19+
#
20+
# Use the PR author (pull_request.user.login), NOT github.actor: github.actor is
21+
# whoever triggered the run, so when merging another PR causes Dependabot to rebase
22+
# this one, the run is attributed to the human merger and the check would not be
23+
# skipped. The PR author stays 'dependabot[bot]' regardless of who triggers the run.
24+
if: github.event.pull_request.user.login != 'dependabot[bot]'
2025

2126
# Optional: Filter by PR author
2227
# if: |
@@ -33,7 +38,7 @@ jobs:
3338

3439
steps:
3540
- name: Checkout repository
36-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
41+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3742
with:
3843
fetch-depth: 1
3944

.github/workflows/claude.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
actions: read # Required for Claude to read CI results on PRs
3030
steps:
3131
- name: Checkout repository
32-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
32+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3333
with:
3434
fetch-depth: 1
3535

.github/workflows/rector.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
steps:
1212
-
1313
if: github.event.pull_request.head.repo.full_name == github.repository
14-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
14+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
1515
with:
1616
# Must be used to trigger workflow after push
1717
token: ${{ secrets.ACCESS_TOKEN }}

0 commit comments

Comments
 (0)