Skip to content

Commit 71e4336

Browse files
iv-craigiv-craig
committed
Pull in updates from mainline
1 parent fa35cc7 commit 71e4336

22 files changed

+14690
-8453
lines changed

‎.distignore

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ multisite.xml.dist
2727
phpcs.xml
2828
.phpcs.xml.dist
2929
phpcs.xml.dist
30-
README.md
3130
wp-cli.local.yml
3231
yarn.lock
3332
tests

‎.github/dependabot.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: composer
9+
directory: '/'
10+
schedule:
11+
interval: weekly
12+
open-pull-requests-limit: 10
13+
labels:
14+
- Dependencies
15+
- PHP
16+
- package-ecosystem: npm
17+
directory: '/'
18+
schedule:
19+
interval: weekly
20+
open-pull-requests-limit: 15
21+
labels:
22+
- Dependencies
23+
- JavaScript

‎.github/workflows/continuous-integration-lint-php.yml

+39-39
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
name: PHP Lints
22

33
on:
4-
push:
5-
branches:
6-
- master
7-
- release/*
8-
pull_request:
4+
push:
5+
branches:
6+
- master
7+
- release/*
8+
pull_request:
99

1010
jobs:
11-
lint-php:
12-
runs-on: ubuntu-latest
13-
steps:
14-
- name: Checkout
15-
uses: actions/checkout@v2
16-
17-
- name: Setup PHP
18-
uses: shivammathur/setup-php@v2
19-
with:
20-
php-version: '7.4'
21-
coverage: none
22-
tools: composer, cs2pr
23-
24-
- name: Get Composer cache directory
25-
id: composer-cache
26-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
27-
28-
- name: Setup Composer cache
29-
uses: pat-s/[email protected]
30-
with:
31-
path: ${{ steps.composer-cache.outputs.dir }}
32-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
33-
restore-keys: |
34-
${{ runner.os }}-composer-
35-
${{ runner.os }}-
36-
37-
- name: Validate composer.json
38-
run: composer --no-interaction validate --no-check-all
39-
40-
- name: Install dependencies
41-
run: composer install --prefer-dist --no-suggest --no-progress --no-interaction
42-
43-
- name: Detect coding standard violations (PHPCS)
44-
run: vendor/bin/phpcs -q --report=checkstyle --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 | cs2pr --graceful-warnings
11+
lint-php:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v2
16+
17+
- name: Setup PHP
18+
uses: shivammathur/setup-php@v2
19+
with:
20+
php-version: '7.4'
21+
coverage: none
22+
tools: composer, cs2pr
23+
24+
- name: Get Composer cache directory
25+
id: composer-cache
26+
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
27+
28+
- name: Setup Composer cache
29+
uses: pat-s/[email protected]
30+
with:
31+
path: ${{ steps.composer-cache.outputs.dir }}
32+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
33+
restore-keys: |
34+
${{ runner.os }}-composer-
35+
${{ runner.os }}-
36+
37+
- name: Validate composer.json
38+
run: composer --no-interaction validate --no-check-all
39+
40+
- name: Install dependencies
41+
run: composer install --prefer-dist --no-suggest --no-progress --no-interaction
42+
43+
- name: Detect coding standard violations (PHPCS)
44+
run: vendor/bin/phpcs -q --report=checkstyle --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 | cs2pr --graceful-warnings

‎.github/workflows/deploytowp.yml

+35-34
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,44 @@
11
name: Deploy to WordPress.org
22
on:
3-
push:
4-
tags:
5-
- "**"
3+
push:
4+
tags:
5+
- '**'
66
jobs:
7-
tag:
8-
name: New tag
9-
runs-on: ubuntu-latest
10-
steps:
11-
- uses: actions/checkout@main
7+
tag:
8+
name: New tag
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@main
1212

13-
- name: Setup PHP
14-
uses: shivammathur/setup-php@v2
15-
with:
16-
php-version: '7.4'
17-
coverage: none
18-
tools: composer
13+
- name: Setup PHP
14+
uses: shivammathur/setup-php@v2
15+
with:
16+
php-version: '7.0'
17+
coverage: none
18+
tools: composer
1919

20-
- name: Validate composer.json and composer.lock
21-
run: composer validate
20+
- name: Validate composer.json and composer.lock
21+
run: composer validate
2222

23-
- name: Get Composer Cache Directory
24-
id: composer-cache
25-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
23+
- name: Get Composer Cache Directory
24+
id: composer-cache
25+
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
2626

27-
- name: Cache Composer vendor directory
28-
uses: actions/cache@v2
29-
with:
30-
path: ${{ steps.composer-cache.outputs.dir }}
31-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
32-
restore-keys: |
33-
${{ runner.os }}-composer-
27+
- name: Cache Composer vendor directory
28+
uses: actions/cache@v2
29+
with:
30+
path: ${{ steps.composer-cache.outputs.dir }}
31+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
32+
restore-keys: |
33+
${{ runner.os }}-composer-
3434
35-
- name: Install PHP Dependencies
36-
run: composer install --prefer-dist --no-progress --no-dev --optimize-autoloader --no-interaction
35+
- name: Install PHP Dependencies
36+
run: composer install --prefer-dist --no-progress --no-dev --optimize-autoloader --no-interaction
3737

38-
- name: WordPress Plugin Deploy
39-
uses: 10up/action-wordpress-plugin-deploy@stable
40-
env:
41-
SLUG: ${{ secrets.SLUG }}
42-
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
43-
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
38+
- name: WordPress Plugin Deploy
39+
uses: 10up/action-wordpress-plugin-deploy@stable
40+
env:
41+
SLUG: ${{ secrets.SLUG }}
42+
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
43+
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
44+
README_NAME: readme.md

0 commit comments

Comments
 (0)