Skip to content

Commit 5d8baed

Browse files
committed
Merge branch 'develop' into 4.7
2 parents ebc25b4 + 509ed87 commit 5d8baed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+537
-508
lines changed

.github/mergeable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ mergeable:
1616
regex: '### CodeIgniter4 Version'
1717
- do: author
1818
must_include:
19-
regex: ^kenjis|lonnieezell|MGatner|michalsn|paulbalandan|samsonasik$
19+
regex: ^kenjis|lonnieezell|MGatner|michalsn|paulbalandan|samsonasik|ddevsr$
2020
fail:
2121
- do: comment
2222
payload:

.github/workflows/deploy-apidocs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ jobs:
2929
git config --global user.name "${GITHUB_ACTOR}"
3030
3131
- name: Checkout source
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v5
3333
with:
3434
path: source
3535

3636
- name: Checkout target
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@v5
3838
with:
3939
repository: codeigniter4/api
4040
token: ${{ secrets.ACCESS_TOKEN }}

.github/workflows/deploy-distributables.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020
with:
2121
fetch-depth: 0 # fetch all tags
2222

@@ -48,12 +48,12 @@ jobs:
4848
git config --global user.name "${GITHUB_ACTOR}"
4949
5050
- name: Checkout source
51-
uses: actions/checkout@v4
51+
uses: actions/checkout@v5
5252
with:
5353
path: source
5454

5555
- name: Checkout target
56-
uses: actions/checkout@v4
56+
uses: actions/checkout@v5
5757
with:
5858
repository: codeigniter4/framework
5959
token: ${{ secrets.ACCESS_TOKEN }}
@@ -98,12 +98,12 @@ jobs:
9898
git config --global user.name "${GITHUB_ACTOR}"
9999
100100
- name: Checkout source
101-
uses: actions/checkout@v4
101+
uses: actions/checkout@v5
102102
with:
103103
path: source
104104

105105
- name: Checkout target
106-
uses: actions/checkout@v4
106+
uses: actions/checkout@v5
107107
with:
108108
repository: codeigniter4/appstarter
109109
token: ${{ secrets.ACCESS_TOKEN }}
@@ -148,12 +148,12 @@ jobs:
148148
git config --global user.name "${GITHUB_ACTOR}"
149149
150150
- name: Checkout source
151-
uses: actions/checkout@v4
151+
uses: actions/checkout@v5
152152
with:
153153
path: source
154154

155155
- name: Checkout target
156-
uses: actions/checkout@v4
156+
uses: actions/checkout@v5
157157
with:
158158
repository: codeigniter4/userguide
159159
token: ${{ secrets.ACCESS_TOKEN }}

.github/workflows/deploy-userguide-latest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v5
2929

3030
- name: Setup PHP
3131
uses: shivammathur/setup-php@v2

.github/workflows/label-add-conflict-all-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-22.04
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
2121

2222
- name: Get PR List
2323
id: PR-list

.github/workflows/label-signing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v5
2323

2424
- name: Check signed commits in PR
2525
uses: 1Password/check-signed-commits-action@v1

.github/workflows/reusable-coveralls.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
steps:
1616
- name: Checkout base branch for PR
1717
if: github.event_name == 'pull_request'
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1919
with:
2020
ref: ${{ github.base_ref }}
2121

2222
- name: Checkout
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
2424

2525
- name: Setup PHP
2626
uses: shivammathur/setup-php@v2
@@ -30,7 +30,7 @@ jobs:
3030
coverage: xdebug
3131

3232
- name: Download coverage files
33-
uses: actions/download-artifact@v4
33+
uses: actions/download-artifact@v5
3434
with:
3535
path: build/cov
3636

.github/workflows/reusable-phpunit-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,12 @@ jobs:
150150
151151
- name: Checkout base branch for PR
152152
if: github.event_name == 'pull_request'
153-
uses: actions/checkout@v4
153+
uses: actions/checkout@v5
154154
with:
155155
ref: ${{ github.base_ref }}
156156

157157
- name: Checkout
158-
uses: actions/checkout@v4
158+
uses: actions/checkout@v5
159159

160160
- name: Setup PHP
161161
uses: shivammathur/setup-php@v2

.github/workflows/reusable-serviceless-phpunit-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ jobs:
6262
6363
- name: Checkout base branch for PR
6464
if: github.event_name == 'pull_request'
65-
uses: actions/checkout@v4
65+
uses: actions/checkout@v5
6666
with:
6767
ref: ${{ github.base_ref }}
6868

6969
- name: Checkout
70-
uses: actions/checkout@v4
70+
uses: actions/checkout@v5
7171

7272
- name: Setup PHP
7373
uses: shivammathur/setup-php@v2

.github/workflows/test-autoreview.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ jobs:
3737
steps:
3838
- name: Checkout base branch for PR
3939
if: github.event_name == 'pull_request'
40-
uses: actions/checkout@v4
40+
uses: actions/checkout@v5
4141
with:
4242
ref: ${{ github.base_ref }}
4343

4444
- name: Checkout
45-
uses: actions/checkout@v4
45+
uses: actions/checkout@v5
4646

4747
- name: Setup PHP
4848
uses: shivammathur/setup-php@v2

0 commit comments

Comments
 (0)