Skip to content

Commit 671e3e7

Browse files
dkotterdkotter
committed
Merge branch 'develop' into trunk
2 parents 86dda2e + ccfb7a9 commit 671e3e7

18 files changed

Lines changed: 110 additions & 51 deletions

‎.github/workflows/build-release-zip.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v3
16+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717

1818
- name: Cache vendor
1919
id: cache-composer
20-
uses: actions/cache@v3
20+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
2121
env:
2222
cache-name: cache-vendor
2323
with:
@@ -28,15 +28,15 @@ jobs:
2828

2929
- name: Cache node_modules
3030
id: cache-node-modules
31-
uses: actions/cache@v3
31+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
3232
env:
3333
cache-name: cache-node-modules
3434
with:
3535
path: node_modules
3636
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
3737

3838
- name: Setup node version and npm cache
39-
uses: actions/setup-node@v3
39+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
4040
with:
4141
node-version-file: '.nvmrc'
4242
cache: 'npm'
@@ -53,4 +53,4 @@ jobs:
5353
run: npm run build
5454

5555
- name: Generate ZIP file
56-
uses: 10up/action-wordpress-plugin-build-zip@stable
56+
uses: 10up/action-wordpress-plugin-build-zip@b9e621e1261ccf51592b6f3943e4dc4518fca0d1 # v1.0.2

‎.github/workflows/close-stale-issues.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
stale:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/stale@v9
18+
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
1919
with:
2020
days-before-stale: 7
2121
days-before-close: 7
@@ -33,4 +33,4 @@ jobs:
3333
close-issue-reason: 'not_planned'
3434
any-of-labels: 'needs:feedback'
3535
remove-stale-when-updated: true
36-
36+

‎.github/workflows/cypress.yml‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@ jobs:
1414
runs-on: ubuntu-latest
1515
outputs:
1616
has_changed: ${{ steps.files-changed.outputs.RSA_FILES_CHANGED }}
17+
1718
steps:
1819
- name: Checkout
19-
uses: actions/checkout@v3
20+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2021
with:
2122
fetch-depth: 0
2223

2324
- name: Get updated JS files
2425
id: changed-files
25-
uses: tj-actions/changed-files@v41
26+
uses: tj-actions/changed-files@2f7c5bfce28377bc069a65ba478de0a74aa0ca32 # v46.0.1
2627
with:
2728
files: |
2829
**/*.php
@@ -39,6 +40,7 @@ jobs:
3940
4041
build:
4142
uses: 10up/restricted-site-access/.github/workflows/build-release-zip.yml@develop
43+
4244
cypress:
4345
runs-on: ubuntu-latest
4446
needs: [check-diffs, build]
@@ -48,14 +50,14 @@ jobs:
4850
core:
4951
- {name: 'WP latest', version: 'latest'}
5052
- {name: 'WP trunk', version: 'WordPress/WordPress#master'}
51-
- {name: 'WP minimum', version: 'WordPress/WordPress#6.5'}
53+
- {name: 'WP minimum', version: 'WordPress/WordPress#6.6'}
5254

5355
steps:
5456
- name: Checkout
55-
uses: actions/checkout@v3
57+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5658

5759
- name: Set PHP version
58-
uses: shivammathur/setup-php@v2
60+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
5961
with:
6062
php-version: '7.4'
6163
coverage: none
@@ -65,16 +67,18 @@ jobs:
6567
run: composer i
6668

6769
- name: Download build zip
68-
uses: actions/download-artifact@v4
70+
uses: actions/download-artifact@b14cf4c92620c250e1c074ab0a5800e37df86765 # v4.2.0
6971
with:
7072
name: ${{ github.event.repository.name }}
7173
path: ${{ github.event.repository.name }}
74+
7275
- name: Display structure of downloaded files
7376
run: ls -R
7477
working-directory: ${{ github.event.repository.name }}
78+
7579
- name: Cache node_modules
7680
id: cache-node-modules
77-
uses: actions/cache@v3
81+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
7882
env:
7983
cache-name: cache-node-modules
8084
with:
@@ -83,10 +87,13 @@ jobs:
8387
~/.cache
8488
~/.npm
8589
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
90+
8691
- name: Install dependencies
8792
run: npm install
93+
8894
- name: Set the core version and plugins config
8995
run: ./tests/bin/set-wp-config.js --core=${{ matrix.core.version }} --plugins=./${{ github.event.repository.name }},./tests/rsa-seeder
96+
9097
- name: Set up WP environment
9198
run: npm run env:start
9299

@@ -100,8 +107,9 @@ jobs:
100107
npx mochawesome-json-to-md -p ./tests/cypress/reports/mochawesome.json -o ./tests/cypress/reports/mochawesome.md
101108
npx mochawesome-report-generator tests/cypress/reports/mochawesome.json -o tests/cypress/reports/
102109
cat ./tests/cypress/reports/mochawesome.md >> $GITHUB_STEP_SUMMARY
110+
103111
- name: Make artifacts available
104-
uses: actions/upload-artifact@v4
112+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
105113
if: failure()
106114
with:
107115
name: cypress-artifact

‎.github/workflows/dependency-review.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: 'Checkout Repository'
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
19+
1920
- name: Dependency Review
20-
uses: actions/dependency-review-action@v3
21+
uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # v4.3.3
2122
with:
2223
license-check: true
2324
vulnerability-check: false

‎.github/workflows/js-lint.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,19 @@ jobs:
1313
eslint:
1414
name: eslint
1515
runs-on: ubuntu-latest
16+
1617
steps:
17-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1819
with:
1920
fetch-depth: 0
2021

2122
- name: install node v16
22-
uses: actions/setup-node@v3
23+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
2324
with:
2425
node-version-file: '.nvmrc'
2526

2627
- name: Install dependencies
2728
run: npm install
2829

2930
- name: Run JS linting
30-
run: npm run lint:js
31+
run: npm run lint:js

‎.github/workflows/php-compatibility.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,16 @@ on:
1212
jobs:
1313
php-compatibility:
1414
name: Sniffs and Compatibility
15-
1615
runs-on: ubuntu-latest
1716

1817
steps:
1918
- name: Checkout
20-
uses: actions/checkout@v3
19+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2120
with:
2221
fetch-depth: 0
2322

2423
- name: Set PHP version
25-
uses: shivammathur/setup-php@v2
24+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
2625
with:
2726
php-version: '7.4'
2827
tools: composer:v2, cs2pr
@@ -33,7 +32,7 @@ jobs:
3332

3433
- name: Get updated PHP files
3534
id: changed-files
36-
uses: tj-actions/changed-files@v41
35+
uses: tj-actions/changed-files@2f7c5bfce28377bc069a65ba478de0a74aa0ca32 # v46.0.1
3736
with:
3837
files: |
3938
**/*.php

‎.github/workflows/phpunit.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@ jobs:
1414
runs-on: ubuntu-latest
1515
outputs:
1616
has_changed: ${{ steps.files-changed.outputs.RSA_PHP_FILES_CHANGED }}
17+
1718
steps:
1819
- name: Checkout
19-
uses: actions/checkout@v3
20+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2021
with:
2122
fetch-depth: 0
2223

2324
- name: Get updated PHP files
2425
id: changed-files
25-
uses: tj-actions/changed-files@v41
26+
uses: tj-actions/changed-files@2f7c5bfce28377bc069a65ba478de0a74aa0ca32 # v46.0.1
2627
with:
2728
files: |
2829
**/*.php
@@ -32,18 +33,20 @@ jobs:
3233
if [[ ( "${{ steps.changed-files.outputs.any_changed }}" == 'true' && "${{ github.event_name }}" == "pull_request" ) || "${{ github.event_name }}" == "push" ]]; then
3334
echo "RSA_PHP_FILES_CHANGED=yes" >> $GITHUB_OUTPUT
3435
fi
36+
3537
phpunit:
3638
runs-on: ubuntu-latest
3739
needs: check-diffs
3840
if: needs.check-diffs.outputs.has_changed == 'yes'
41+
3942
steps:
4043
- name: Checkout
41-
uses: actions/checkout@v3
44+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4245

43-
- uses: getong/mariadb-action@v1.1
46+
- uses: getong/mariadb-action@d6d2ec41fd5588f369be4c9398ce77ee725ca9ea # v1.11
4447

4548
- name: Set PHP version
46-
uses: shivammathur/setup-php@v2
49+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
4750
with:
4851
php-version: '7.4'
4952
coverage: none
@@ -53,7 +56,7 @@ jobs:
5356
run: composer install
5457

5558
- name: install node v16
56-
uses: actions/setup-node@v3
59+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
5760
with:
5861
node-version-file: '.nvmrc'
5962

‎.github/workflows/push-asset-readme-update.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ jobs:
99
trunk:
1010
name: Push to trunk
1111
runs-on: ubuntu-latest
12+
1213
steps:
1314
- name: Checkout code
14-
uses: actions/checkout@v4
15+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1516

1617
- name: Build
1718
run: |
@@ -20,7 +21,7 @@ jobs:
2021
composer i --no-dev
2122
2223
- name: WordPress.org plugin asset/readme update
23-
uses: 10up/action-wordpress-plugin-asset-update@stable
24+
uses: 10up/action-wordpress-plugin-asset-update@2480306f6f693672726d08b5917ea114cb2825f7 # v2.2.0
2425
env:
2526
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
2627
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

‎.github/workflows/push-deploy.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
name: Deploy to WordPress.org
2+
23
on:
34
push:
45
tags:
56
- "*"
7+
68
jobs:
79
tag:
810
name: New tag
911
runs-on: ubuntu-latest
12+
1013
steps:
11-
- uses: actions/checkout@master
14+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
15+
1216
- name: Build
1317
run: |
1418
npm install
1519
npm run build
20+
1621
- name: Install PHP dependencies
17-
run: composer i --no-dev
22+
run: composer i --no-dev
23+
1824
- name: WordPress Plugin Deploy
19-
uses: 10up/action-wordpress-plugin-deploy@stable
25+
uses: 10up/action-wordpress-plugin-deploy@54bd289b8525fd23a5c365ec369185f2966529c2 # v2.3.0
2026
env:
2127
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
2228
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

‎.github/workflows/repo-automator.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: 'Repo Automator'
2+
23
on:
34
issues:
45
types:
@@ -19,8 +20,9 @@ on:
1920
jobs:
2021
Validate:
2122
runs-on: ubuntu-latest
23+
2224
steps:
23-
- uses: 10up/action-repo-automator@trunk
25+
- uses: 10up/action-repo-automator@280f5dc0b4ed1b5c50c816e08623bdefce55cdce # v2.1.3
2426
with:
2527
fail-label: needs:feedback
2628
pass-label: needs:code-review

0 commit comments

Comments
 (0)