Skip to content

Commit cef9dea

Browse files
committed
Merge branch '3.x' into 4.x
2 parents ad16dfa + 20a26fe commit cef9dea

12 files changed

+79
-63
lines changed

.github/dependabot.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ updates:
1616
prefix: "GH Actions:"
1717
labels:
1818
- "Type: chores/QA"
19+
cooldown:
20+
semver-major-days: 10
21+
groups:
22+
action-runners:
23+
applies-to: version-updates
24+
update-types:
25+
- "minor"
26+
- "patch"
1927

2028
# Handle updates for the orphan gh-pages branch.
2129
- package-ecosystem: "github-actions"
@@ -28,3 +36,11 @@ updates:
2836
prefix: "GH Pages/Actions:"
2937
labels:
3038
- "Type: chores/QA"
39+
cooldown:
40+
semver-major-days: 10
41+
groups:
42+
action-runners:
43+
applies-to: version-updates
44+
update-types:
45+
- "minor"
46+
- "patch"

.github/workflows/end-to-end-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ jobs:
3939
run: git config --global core.autocrlf input
4040

4141
- name: Checkout code
42-
uses: actions/checkout@v5
42+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4343

4444
- name: Install PHP
45-
uses: shivammathur/setup-php@v2
45+
uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # 2.35.5
4646
with:
4747
php-version: ${{ matrix.php }}
4848
ini-values: "error_reporting=-1, display_errors=On, display_startup_errors=On"

.github/workflows/happy-new-year.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ jobs:
4949
run: "echo current year: ${{ steps.year.outputs.NEW_YEAR }} - previous year: ${{ steps.year.outputs.PREVIOUS_YEAR }}"
5050

5151
- name: Checkout code
52-
uses: actions/checkout@v5
52+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5353
with:
5454
ref: ${{ steps.branches.outputs.BASE }}
5555

5656
- name: Update the year in the copyright tag in the fixed file
5757
id: findreplace
58-
uses: jacobtomlinson/gha-find-replace@v3
58+
uses: jacobtomlinson/gha-find-replace@f1069b438f125e5395d84d1c6fd3b559a7880cb5 # 3.0.5
5959
with:
6060
find: "* @copyright ${{ steps.year.outputs.PREVIOUS_YEAR }} Squiz Pty Ltd (ABN 77 084 670 600)"
6161
replace: "* @copyright ${{ steps.year.outputs.NEW_YEAR }} Squiz Pty Ltd (ABN 77 084 670 600)"
@@ -73,7 +73,7 @@ jobs:
7373
run: exit 1
7474

7575
- name: Create pull request
76-
uses: peter-evans/create-pull-request@v7
76+
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
7777
with:
7878
base: ${{ steps.branches.outputs.BASE }}
7979
branch: ${{ steps.branches.outputs.PR_BRANCH }}

.github/workflows/label-merge-conflicts.yml

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

2323
steps:
2424
- name: Check PRs for merge conflicts
25-
uses: eps1lon/actions-label-merge-conflict@v3
25+
uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
2626
with:
2727
dirtyLabel: "Status: has merge conflict"
2828
repoToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/label-new-prs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Label new PRs
28-
uses: srvaroa/labeler@v1
28+
uses: srvaroa/labeler@0a20eccb8c94a1ee0bed5f16859aece1c45c3e55 # v1.13.0
2929
env:
3030
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
3131

@@ -38,10 +38,10 @@ jobs:
3838
steps:
3939
# Checkout is needed to use the `use_local_config` option.
4040
- name: Checkout code
41-
uses: actions/checkout@v5
41+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4242

4343
- name: Verify changes to the labeling logic
44-
uses: srvaroa/labeler@v1
44+
uses: srvaroa/labeler@0a20eccb8c94a1ee0bed5f16859aece1c45c3e55 # v1.13.0
4545
with:
4646
use_local_config: true
4747
fail_on_error: true

.github/workflows/label-remove-outdated.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
name: Clean up labels on issue close
1919

2020
steps:
21-
- uses: mondeja/remove-labels-gh-action@v2
21+
- uses: mondeja/remove-labels-gh-action@b7118e4ba5dca74acf1059b3cb7660378ff9ab1a # v2.0.0
2222
with:
2323
token: ${{ secrets.GITHUB_TOKEN }}
2424
labels: |
@@ -35,7 +35,7 @@ jobs:
3535
name: "Clean up labels on PR (re-)review request"
3636

3737
steps:
38-
- uses: mondeja/remove-labels-gh-action@v2
38+
- uses: mondeja/remove-labels-gh-action@b7118e4ba5dca74acf1059b3cb7660378ff9ab1a # v2.0.0
3939
with:
4040
token: ${{ secrets.GITHUB_TOKEN }}
4141
labels: |
@@ -48,7 +48,7 @@ jobs:
4848
name: Clean up labels on PR merge
4949

5050
steps:
51-
- uses: mondeja/remove-labels-gh-action@v2
51+
- uses: mondeja/remove-labels-gh-action@b7118e4ba5dca74acf1059b3cb7660378ff9ab1a # v2.0.0
5252
with:
5353
token: ${{ secrets.GITHUB_TOKEN }}
5454
labels: |
@@ -68,7 +68,7 @@ jobs:
6868
name: Clean up labels on PR close
6969

7070
steps:
71-
- uses: mondeja/remove-labels-gh-action@v2
71+
- uses: mondeja/remove-labels-gh-action@b7118e4ba5dca74acf1059b3cb7660378ff9ab1a # v2.0.0
7272
with:
7373
token: ${{ secrets.GITHUB_TOKEN }}
7474
labels: |

.github/workflows/quicktest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ jobs:
3838
run: git config --global core.autocrlf input
3939

4040
- name: Checkout code
41-
uses: actions/checkout@v5
41+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4242

4343
- name: Install PHP
44-
uses: shivammathur/setup-php@v2
44+
uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # 2.35.5
4545
with:
4646
php-version: ${{ matrix.php }}
4747
ini-values: 'error_reporting=-1, display_errors=On, display_startup_errors=On'
@@ -50,7 +50,7 @@ jobs:
5050
# Install dependencies and handle caching in one go.
5151
# @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
5252
- name: Install Composer dependencies
53-
uses: "ramsey/composer-install@v3"
53+
uses: "ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520" # 3.1.1
5454
with:
5555
# Bust the cache at least once a month - output format: YYYY-MM.
5656
custom-cache-suffix: $(date -u "+%Y-%m")

.github/workflows/reusable-build-phar.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ jobs:
3333

3434
steps:
3535
- name: Checkout code
36-
uses: actions/checkout@v5
36+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3737

3838
- name: Setup PHP
39-
uses: shivammathur/setup-php@v2
39+
uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # 2.35.5
4040
with:
4141
php-version: ${{ inputs.phpVersion }}
4242
coverage: none
@@ -48,15 +48,15 @@ jobs:
4848
# Provide provenance for generated binaries.
4949
- name: Generate artifact attestations
5050
if: ${{ inputs.createAttestations == true }}
51-
uses: actions/attest-build-provenance@v3
51+
uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0
5252
with:
5353
subject-path: |
5454
${{ github.workspace }}/phpcs.phar
5555
${{ github.workspace }}/phpcbf.phar
5656
5757
- name: Upload the PHPCS phar
5858
if: ${{ inputs.uploadArtifacts == true }}
59-
uses: actions/upload-artifact@v4
59+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
6060
with:
6161
name: phpcs-phar
6262
path: ./phpcs.phar
@@ -65,7 +65,7 @@ jobs:
6565

6666
- name: Upload the PHPCBF phar
6767
if: ${{ inputs.uploadArtifacts == true }}
68-
uses: actions/upload-artifact@v4
68+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
6969
with:
7070
name: phpcbf-phar
7171
path: ./phpcbf.phar

.github/workflows/test-requirements-check.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ jobs:
5151

5252
steps:
5353
- name: Checkout code
54-
uses: actions/checkout@v5
54+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5555

5656
- name: Install PHP
57-
uses: shivammathur/setup-php@v2
57+
uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # 2.35.5
5858
with:
5959
php-version: ${{ matrix.php }}
6060
coverage: none
@@ -93,10 +93,10 @@ jobs:
9393

9494
steps:
9595
- name: Checkout code
96-
uses: actions/checkout@v5
96+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
9797

9898
- name: Install PHP
99-
uses: shivammathur/setup-php@v2
99+
uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # 2.35.5
100100
with:
101101
php-version: 'latest'
102102
ini-values: 'error_reporting=-1, display_errors=On, display_startup_errors=On'
@@ -126,10 +126,10 @@ jobs:
126126

127127
steps:
128128
- name: Checkout code
129-
uses: actions/checkout@v5
129+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
130130

131131
- name: Install PHP
132-
uses: shivammathur/setup-php@v2
132+
uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # 2.35.5
133133
with:
134134
php-version: ${{ matrix.php }}
135135
ini-values: 'error_reporting=-1, display_errors=On, display_startup_errors=On'
@@ -193,10 +193,10 @@ jobs:
193193

194194
steps:
195195
- name: Checkout code
196-
uses: actions/checkout@v5
196+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
197197

198198
- name: Install PHP
199-
uses: shivammathur/setup-php@v2
199+
uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # 2.35.5
200200
with:
201201
php-version: ${{ matrix.php }}
202202
ini-values: 'error_reporting=-1, display_errors=On, display_startup_errors=On'
@@ -206,7 +206,7 @@ jobs:
206206
fail-fast: true
207207

208208
- name: Download the phar
209-
uses: actions/download-artifact@v4
209+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
210210
with:
211211
name: ${{ matrix.cmd }}-phar
212212

.github/workflows/test.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ jobs:
108108
run: git config --global core.autocrlf input
109109

110110
- name: Checkout code
111-
uses: actions/checkout@v5
111+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
112112

113113
- name: "libxml2: find the latest relevant tag"
114114
if: ${{ matrix.libxml_minor }}
115115
id: libxml_version
116-
uses: oprypin/find-latest-tag@v1
116+
uses: oprypin/find-latest-tag@dd2729fe78b0bb55523ae2b2a310c6773a652bd1 # v1.1.2
117117
with:
118118
repository: GNOME/libxml2
119119
releases-only: false # The libxml2 repository doesn't use GitHub's "release" feature.
@@ -132,7 +132,7 @@ jobs:
132132
- name: "libxml2: restore cache"
133133
if: ${{ matrix.libxml_minor }}
134134
id: libxml_cache_restore
135-
uses: actions/cache/restore@v4
135+
uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
136136
with:
137137
path: "libxml2-${{ steps.libxml_patch_version.outputs.PATCH }}"
138138
key: "${{ matrix.os }}-libxml-${{ matrix.libxml_minor }}-${{ steps.libxml_patch_version.outputs.PATCH }}"
@@ -160,7 +160,7 @@ jobs:
160160
- name: "libxml2: save cache"
161161
if: ${{ matrix.libxml_minor && steps.libxml_cache_restore.outputs.cache-hit != 'true' }}
162162
id: libxml_cache_save
163-
uses: actions/cache/save@v4
163+
uses: actions/cache/save@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
164164
with:
165165
path: "libxml2-${{ steps.libxml_patch_version.outputs.PATCH }}"
166166
key: ${{ steps.libxml_cache_restore.outputs.cache-primary-key }}
@@ -189,7 +189,7 @@ jobs:
189189
# yamllint enable rule:line-length
190190
191191
- name: Install PHP
192-
uses: shivammathur/setup-php@v2
192+
uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # 2.35.5
193193
with:
194194
php-version: ${{ matrix.php }}
195195
ini-values: ${{ steps.set_ini.outputs.PHP_INI }}
@@ -202,7 +202,7 @@ jobs:
202202
# Install dependencies and handle caching in one go.
203203
# @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
204204
- name: Install Composer dependencies
205-
uses: "ramsey/composer-install@v3"
205+
uses: "ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520" # 3.1.1
206206
with:
207207
composer-options: ${{ matrix.php == '8.5' && '--ignore-platform-req=php+' || '' }}
208208
custom-cache-suffix: $(date -u "+%Y-%m")
@@ -258,7 +258,7 @@ jobs:
258258

259259
- name: Download the PHPCS phar
260260
if: ${{ matrix.custom_ini == false }}
261-
uses: actions/download-artifact@v5
261+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
262262
with:
263263
name: phpcs-phar
264264

@@ -303,7 +303,7 @@ jobs:
303303
run: git config --global core.autocrlf input
304304

305305
- name: Checkout code
306-
uses: actions/checkout@v5
306+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
307307

308308
- name: Setup ini config
309309
if: ${{ matrix.custom_ini == true && matrix.os != 'windows-latest' }}
@@ -314,7 +314,7 @@ jobs:
314314
echo 'PHP_INI=, date.timezone=Australia/Sydney, short_open_tag=On' >> "$GITHUB_OUTPUT"
315315
316316
- name: Install PHP
317-
uses: shivammathur/setup-php@v2
317+
uses: shivammathur/setup-php@bf6b4fbd49ca58e4608c9c89fba0b8d90bd2a39f # 2.35.5
318318
with:
319319
php-version: ${{ matrix.php }}
320320
ini-values: error_reporting=-1, display_errors=On, display_startup_errors=On${{ steps.set_ini.outputs.PHP_INI }}
@@ -324,7 +324,7 @@ jobs:
324324
# Install dependencies and handle caching in one go.
325325
# @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
326326
- name: Install Composer dependencies
327-
uses: "ramsey/composer-install@v3"
327+
uses: "ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520" # 3.1.1
328328
with:
329329
# Bust the cache at least once a month - output format: YYYY-MM.
330330
custom-cache-suffix: $(date -u "+%Y-%m")
@@ -393,7 +393,7 @@ jobs:
393393
394394
- name: "Upload coverage results to Coveralls (normal run)"
395395
if: ${{ success() }}
396-
uses: coverallsapp/github-action@v2
396+
uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2.3.6
397397
with:
398398
format: clover
399399
file: build/logs/clover.xml
@@ -402,7 +402,7 @@ jobs:
402402

403403
- name: "Upload coverage results to Coveralls (CBF run)"
404404
if: ${{ matrix.os != 'windows-latest' && success() }}
405-
uses: coverallsapp/github-action@v2
405+
uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2.3.6
406406
with:
407407
format: clover
408408
file: build/logs/clover-cbf.xml
@@ -417,6 +417,6 @@ jobs:
417417

418418
steps:
419419
- name: Coveralls Finished
420-
uses: coverallsapp/github-action@v2
420+
uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2.3.6
421421
with:
422422
parallel-finished: true

0 commit comments

Comments
 (0)