Skip to content

Commit 257973e

Browse files
committed
Merge branch 'develop' into trunk
2 parents 2741ace + e267bb1 commit 257973e

26 files changed

+2686
-331
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
/.gitattributes export-ignore
88
/.gitignore export-ignore
99
/.phpcs.xml.dist export-ignore
10+
/.phpunit.result.cache export-ignore
1011
/.wp-env.json export-ignore
1112
/.wp-env.override.json export-ignore
1213
/CHANGELOG.md export-ignore
@@ -18,4 +19,5 @@
1819
/LICENSE.md export-ignore
1920
/package-lock.json export-ignore
2021
/package.json export-ignore
22+
/phpunit.xml.dist export-ignore
2123
/README.md export-ignore

.github/workflows/no-response.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: No Response
2+
3+
# **What it does**: Closes issues where the original author doesn't respond to a request for information.
4+
# **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.
6+
7+
on:
8+
issue_comment:
9+
types: [created]
10+
schedule:
11+
# Schedule for five minutes after the hour, every hour
12+
- cron: '5 * * * *'
13+
14+
jobs:
15+
noResponse:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: lee-dohm/[email protected]
19+
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: >
24+
This issue has been automatically closed because there has been no response
25+
to our request for more information. With only the
26+
information that is currently in the issue, we don't have enough information
27+
to take action. Please reach out if you have or find the answers we need so
28+
that we can investigate further. See [this blog post on bug reports and the
29+
importance of repro steps](https://www.lee-dohm.com/2015/01/04/writing-good-bug-reports/)
30+
for more information about the kind of information that may be helpful.

.github/workflows/php8-compatibility.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
php: [ '5.3', '5.4', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
23+
php: [ '7.4', '8.0', '8.1' ]
2424

2525
steps:
2626
- name: Checkout

.github/workflows/phpunit.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Unit Tests
2+
3+
env:
4+
COMPOSER_VERSION: "2"
5+
COMPOSER_CACHE: "${{ github.workspace }}/.composer-cache"
6+
7+
on:
8+
push:
9+
branches:
10+
- develop
11+
- trunk
12+
pull_request:
13+
branches:
14+
- develop
15+
16+
jobs:
17+
phpunit:
18+
name: ${{ matrix.name }}
19+
runs-on: ubuntu-latest
20+
21+
strategy:
22+
matrix:
23+
php:
24+
- {name: 'PHP 7.4', version: '7.4'}
25+
- {name: 'PHP 8.1', version: '8.1'}
26+
27+
steps:
28+
- name: Checkout
29+
uses: actions/checkout@v2
30+
31+
- name: Set standard 10up cache directories
32+
run: |
33+
composer config -g cache-dir "${{ env.COMPOSER_CACHE }}"
34+
35+
- name: Prepare composer cache
36+
uses: actions/cache@v2
37+
with:
38+
path: ${{ env.COMPOSER_CACHE }}
39+
key: composer-${{ env.COMPOSER_VERSION }}-${{ hashFiles('**/composer.lock') }}
40+
restore-keys: |
41+
composer-${{ env.COMPOSER_VERSION }}-
42+
43+
- name: Set PHP version
44+
uses: shivammathur/setup-php@v2
45+
with:
46+
php-version: '${{ matrix.php.version }}'
47+
coverage: none
48+
tools: composer:v2
49+
50+
- name: Install dependencies
51+
run: composer install
52+
53+
- name: Test
54+
run: ./vendor/bin/phpunit -v

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@master
1212
- name: WordPress.org plugin asset/readme update
13-
uses: 10up/action-wordpress-plugin-asset-update@master
13+
uses: 10up/action-wordpress-plugin-asset-update@stable
1414
env:
1515
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
1616
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

.github/workflows/push-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
steps:
1111
- uses: actions/checkout@master
1212
- name: WordPress Plugin Deploy
13-
uses: 10up/action-wordpress-plugin-deploy@master
13+
uses: 10up/action-wordpress-plugin-deploy@stable
1414
env:
1515
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
1616
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

.github/workflows/test-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
matrix:
1313
core:
1414
- {name: 'WP latest', version: 'latest'}
15-
- {name: 'WP minimum', version: 'WordPress/WordPress#4.9'}
15+
- {name: 'WP minimum', version: 'WordPress/WordPress#5.7'}
1616
- {name: 'WP trunk', version: 'WordPress/WordPress#master'}
1717
steps:
1818
- name: Checkout
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: "WordPress version checker"
2+
on:
3+
push:
4+
branches:
5+
- develop
6+
- trunk
7+
pull_request:
8+
branches:
9+
- develop
10+
schedule:
11+
- cron: '0 0 * * 1'
12+
13+
jobs:
14+
wordpress-version-checker:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: WordPress version checker
18+
uses: skaut/[email protected]
19+
with:
20+
repo-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ tests/cypress/screenshots
66
tests/cypress/videos
77

88
.wp-env.override.json
9+
.phpunit.result.cache

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file, per [the Ke
44

55
## [Unreleased] - TBD
66

7+
## [1.4.1] - 2022-12-14
8+
### Added
9+
- Support for OWNERDOMAIN & MANAGERDOMAIN per version 1.1 of the spec (props [@SoftCreatR](https://github.com/SoftCreatR), [@tott](https://github.com/tott), [@jeffpaul](https://github.com/jeffpaul), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#108](https://github.com/10up/ads-txt/pull/108))
10+
- Unit tests (props [@jeffpaul](https://github.com/jeffpaul), [@cadic](https://github.com/cadic), [@faisal-alvi](https://github.com/faisal-alvi), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#87](https://github.com/10up/ads-txt/pull/87))
11+
- Dependency security scanning (props [@jeffpaul](https://github.com/jeffpaul), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#97](https://github.com/10up/ads-txt/pull/97))
12+
13+
### Changed
14+
- Bump Wordpress tested up to to 6.1 (props [@jayedul](https://github.com/jayedul), [@dkotter](https://github.com/dkotter), [@jeffpaul](https://github.com/jeffpaul), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#113](https://github.com/10up/ads-txt/pull/113))
15+
- Minimum WP and PHP version requirement bumped to 5.7 and 7.4 respectively (props [@jayedul](https://github.com/jayedul), [@dkotter](https://github.com/dkotter), [@peterwilsoncc](https://github.com/peterwilsoncc), [@cadic](https://github.com/cadic) via [#103](https://github.com/10up/ads-txt/pull/103), [#117](https://github.com/10up/ads-txt/pull/117))
16+
17+
### Fixed
18+
- Base URL corrected for E2E test suite. (props [@peterwilsoncc](https://github.com/peterwilsoncc), [@cadic](https://github.com/cadic), [@dkotter](https://github.com/dkotter) via [#112](https://github.com/10up/ads-txt/pull/112))
19+
20+
### Security
21+
- Bump got and @wordpress/env (props [@jeffpaul](https://github.com/jeffpaul), [@peterwilsoncc](https://github.com/peterwilsoncc), [@dependabot](https://github.com/dependabot), [@dkotter](https://github.com/dkotter) via [#104](https://github.com/10up/ads-txt/pull/104))
22+
- Bump simple-git and @wordpress/env (props [@jeffpaul](https://github.com/jeffpaul), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#105](https://github.com/10up/ads-txt/pull/105))
23+
724
## [1.4.0] - 2022-04-13
825
### Added
926
- Support for the `INVENTORYPARTNERDOMAIN` variable (props [@dkotter](https://github.com/dkotter), [@faisal-alvi](https://github.com/faisal-alvi) via [#74](https://github.com/10up/ads-txt/pull/74))
@@ -57,6 +74,7 @@ All notable changes to this project will be documented in this file, per [the Ke
5774
- Initial plugin release
5875

5976
[Unreleased]: https://github.com/10up/ads-txt/compare/trunk...develop
77+
[1.4.1]: https://github.com/10up/ads-txt/compare/1.4.0...1.4.1
6078
[1.4.0]: https://github.com/10up/ads-txt/compare/1.3.0...1.4.0
6179
[1.3.0]: https://github.com/10up/ads-txt/compare/1.2.0...1.3.0
6280
[1.2.0]: https://github.com/10up/ads-txt/compare/1.1...1.2.0

0 commit comments

Comments
 (0)