Skip to content

Commit 896e902

Browse files
committed
Merge branch 'develop' into trunk
2 parents 9090521 + eee5bae commit 896e902

32 files changed

+8866
-5734
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# These owners will be the default owners for everything in the repo. Unless a later match takes precedence, @10up/open-source-practice, as primary maintainers will be requested for review when someone opens a Pull Request.
2-
* @10up/open-source-practice
1+
# These owners will be the default owners for everything in the repo. Unless a later match takes precedence, @jeffpaul and @dkotter, as primary maintainers will be requested for review when someone opens a Pull Request.
2+
* @jeffpaul @dkotter
33

44
# GitHub and WordPress.org specifics
55
/.github/ @jeffpaul

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: Build release zip
22

33
on:
44
workflow_dispatch:
5+
workflow_call:
56
push:
67
branches:
78
- trunk
@@ -12,19 +13,19 @@ jobs:
1213
runs-on: ubuntu-latest
1314
steps:
1415
- name: Checkout
15-
uses: actions/checkout@v3
16+
uses: actions/checkout@v4
1617

1718
- name: Cache node_modules
1819
id: cache-node-modules
19-
uses: actions/cache@v3
20+
uses: actions/cache@v4
2021
env:
2122
cache-name: cache-node-modules
2223
with:
2324
path: node_modules
2425
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
2526

2627
- name: Setup node version and npm cache
27-
uses: actions/setup-node@v3
28+
uses: actions/setup-node@v4
2829
with:
2930
cache: 'npm'
3031
node-version-file: '.nvmrc'
Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,36 @@
1-
name: No Response
1+
name: 'Close stale issues'
22

33
# **What it does**: Closes issues where the original author doesn't respond to a request for information.
44
# **Why we have it**: To remove the need for maintainers to remember to check back on issues periodically to see if contributors have responded.
5-
# **Who does it impact**: Everyone that works on docs or docs-internal.
65

76
on:
8-
issue_comment:
9-
types: [created]
107
schedule:
11-
# Schedule for five minutes after the hour, every hour
12-
- cron: '5 * * * *'
8+
# Schedule for every day at 1:30am UTC
9+
- cron: '30 1 * * *'
10+
11+
permissions:
12+
issues: write
1313

1414
jobs:
15-
noResponse:
15+
stale:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: lee-dohm/[email protected]
18+
- uses: actions/stale@v9
1919
with:
20-
token: ${{ github.token }}
21-
daysUntilClose: 14 # Number of days of inactivity before an Issue is closed for lack of response
22-
responseRequiredLabel: "needs:feedback" # Label indicating that a response from the original author is required
23-
closeComment: >
20+
days-before-stale: 7
21+
days-before-close: 7
22+
stale-issue-message: >
23+
It has been 7 days since more information was requested from you in this issue and we have not heard back. This issue is now marked as stale and will be closed in 7 days, but if you have more information to add then please comment and the issue will stay open.
24+
close-issue-message: >
2425
This issue has been automatically closed because there has been no response
2526
to our request for more information. With only the
2627
information that is currently in the issue, we don't have enough information
2728
to take action. Please reach out if you have or find the answers we need so
2829
that we can investigate further. See [this blog post on bug reports and the
2930
importance of repro steps](https://www.lee-dohm.com/2015/01/04/writing-good-bug-reports/)
3031
for more information about the kind of information that may be helpful.
32+
stale-issue-label: 'stale'
33+
close-issue-reason: 'not_planned'
34+
any-of-labels: 'needs:feedback'
35+
remove-stale-when-updated: true
36+

.github/workflows/cypress.yml

Lines changed: 29 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -4,81 +4,66 @@ on:
44
pull_request:
55
branches:
66
- develop
7+
78
jobs:
89
build:
9-
name: Build and cache
10-
runs-on: ubuntu-latest
11-
steps:
12-
- uses: actions/checkout@v3
13-
- name: install node
14-
uses: actions/setup-node@v3
15-
with:
16-
node-version-file: '.nvmrc'
17-
- uses: actions/cache@v3
18-
id: cache-node
19-
with:
20-
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
21-
path: |
22-
node_modules
23-
~/.cache
24-
~/.npm
25-
- uses: actions/cache@v3
26-
id: cache-build
27-
with:
28-
key: ${{ runner.os }}-build-${{ hashFiles('src/**/*') }}
29-
path: |
30-
dist
31-
languages
32-
- uses: actions/setup-node@v3
33-
with:
34-
node-version-file: '.nvmrc'
35-
- run: npm ci
36-
- run: npm run build
10+
uses: 10up/insecure-content-warning/.github/workflows/build-release-zip.yml@develop
3711

3812
cypress:
3913
needs: build
4014
name: ${{ matrix.core.name }}
4115
runs-on: ubuntu-latest
4216
if: always()
17+
4318
strategy:
4419
matrix:
4520
core:
4621
- {name: 'WP latest', version: 'latest'}
47-
- {name: 'WP minimum', version: 'WordPress/WordPress#5.8'}
22+
- {name: 'WP minimum', version: 'WordPress/WordPress#6.4'}
4823
- {name: 'WP trunk', version: 'WordPress/WordPress#master'}
24+
4925
steps:
5026
- name: Checkout
51-
uses: actions/checkout@v3
52-
- name: install node
53-
uses: actions/setup-node@v3
27+
uses: actions/checkout@v4
28+
29+
- name: Download built zip
30+
uses: actions/download-artifact@v4
31+
with:
32+
name: ${{ github.event.repository.name }}
33+
path: ${{ github.event.repository.name }}
34+
35+
- name: Display structure of downloaded files
36+
run: ls -R
37+
working-directory: ${{ github.event.repository.name }}
38+
39+
- name: Install node
40+
uses: actions/setup-node@v4
5441
with:
5542
node-version-file: '.nvmrc'
56-
- uses: actions/cache@v3
43+
44+
- uses: actions/cache@v4
5745
id: cache-node
5846
with:
5947
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
6048
path: |
6149
node_modules
6250
~/.cache
6351
~/.npm
64-
- uses: actions/cache@v3
65-
id: cache-build
66-
with:
67-
key: ${{ runner.os }}-build-${{ hashFiles('src/**/*') }}
68-
path: |
69-
dist
70-
languages
52+
7153
- run: npm ci
7254
if: ${{ steps.cache-node.outputs.cache-hit != 'true' }}
73-
- run: npm run build
74-
- name: Set the core version
75-
run: ./tests/bin/set-core-version.js ${{ matrix.core.version }}
55+
56+
- name: Set the core version and plugins config
57+
run: ./tests/bin/set-wp-config.js --core=${{ matrix.core.version }} --plugins=./${{ github.event.repository.name }},https://downloads.wordpress.org/plugin/classic-editor.zip
58+
7659
- name: Set up WP environment
7760
run: npm run env:start
61+
7862
- name: Test
7963
run: npm run cypress:run
64+
8065
- name: Upload artifacts
81-
uses: actions/upload-artifact@v3
66+
uses: actions/upload-artifact@v4
8267
if: failure()
8368
with:
8469
name: cypress-artifact-insecure-content-warning

.github/workflows/dependency-review.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: 'Checkout Repository'
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
- name: Dependency Review
20-
uses: actions/dependency-review-action@v3
20+
uses: actions/dependency-review-action@v4
2121
with:
2222
license-check: true
2323
vulnerability-check: false

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414

1515
- name: Setup node version
16-
uses: actions/setup-node@v3
16+
uses: actions/setup-node@v4
1717
with:
1818
node-version: 16
1919

@@ -32,11 +32,8 @@ jobs:
3232
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
3333

3434
- name: Upload release asset
35-
uses: actions/upload-release-asset@v1
35+
uses: softprops/action-gh-release@v2
3636
env:
3737
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3838
with:
39-
upload_url: ${{ github.event.release.upload_url }}
40-
asset_path: ${{ steps.deploy.outputs.zip-path }}
41-
asset_name: ${{ github.event.repository.name }}.zip
42-
asset_content_type: application/zip
39+
files: ${{ github.workspace }}/${{ github.event.repository.name }}.zip

.github/workflows/lint.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,36 @@ jobs:
1414
name: eslint
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v4
18+
1819
- name: install node
19-
uses: actions/setup-node@v3
20+
uses: actions/setup-node@v4
2021
with:
2122
node-version-file: '.nvmrc'
22-
- uses: actions/cache@v3
23+
24+
- uses: actions/cache@v4
2325
id: cache-node
2426
with:
2527
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
2628
path: |
2729
node_modules
2830
~/.cache
2931
~/.npm
32+
3033
- name: npm install
3134
run: npm ci
35+
3236
- name: eslint
3337
run: npm run lint:js
38+
3439
phpcs:
3540
name: phpcs
3641
runs-on: ubuntu-latest
42+
3743
steps:
3844
- name: Checkout
39-
uses: actions/checkout@v2
45+
uses: actions/checkout@v4
46+
4047
- name: WPCS check
4148
uses: 10up/wpcs-action@stable
4249
with:

.github/workflows/php-compatibility.yml

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

1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v4
2121

2222
- name: Set PHP version
2323
uses: shivammathur/setup-php@v2

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16
1+
20.11.0

.stylelintrc

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)