Skip to content

Commit ce69969

Browse files
committed
Merge branch 'develop' into trunk
2 parents be7c4df + a34744e commit ce69969

26 files changed

+1539
-3425
lines changed

.gitattributes

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@
44
/tests export-ignore
55
/vendor export-ignore
66

7-
/.gitattributes export-ignore
8-
/.gitignore export-ignore
9-
/.phpcs.xml.dist export-ignore
10-
/.phpcompat.xml.dist export-ignore
11-
/.phpunit.result.cache export-ignore
12-
/.wp-env.json export-ignore
13-
/.wp-env.override.json export-ignore
7+
/.* export-ignore
148
/CHANGELOG.md export-ignore
159
/CODE_OF_CONDUCT.md export-ignore
1610
/composer.json export-ignore

.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, @peterwilsoncc, as primary maintainer will be requested for review when someone opens a Pull Request.
2-
* @peterwilsoncc
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
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ jobs:
1919
matrix:
2020
core:
2121
- {name: 'WP latest', version: 'latest'}
22-
- {name: 'WP minimum', version: 'WordPress/WordPress#5.7'}
22+
- {name: 'WP minimum', version: 'WordPress/WordPress#6.3'}
2323
- {name: 'WP trunk', version: 'WordPress/WordPress#master'}
2424
steps:
2525
- name: Checkout
2626
uses: actions/checkout@v3
2727
- name: Download build zip
28-
uses: actions/download-artifact@v3
28+
uses: actions/download-artifact@v4
2929
with:
3030
name: ${{ github.event.repository.name }}
3131
path: ${{ github.event.repository.name }}
@@ -62,7 +62,7 @@ jobs:
6262
npx mochawesome-report-generator tests/cypress/reports/mochawesome.json -o tests/cypress/reports/
6363
cat ./tests/cypress/reports/mochawesome.md >> $GITHUB_STEP_SUMMARY
6464
- name: Make artifacts available
65-
uses: actions/upload-artifact@v3
65+
uses: actions/upload-artifact@v4
6666
if: failure()
6767
with:
6868
name: cypress-artifact
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: 'Repo Automator'
2+
on:
3+
issues:
4+
types:
5+
- opened
6+
push:
7+
branches:
8+
- develop
9+
pull_request:
10+
types:
11+
- opened
12+
- edited
13+
- synchronize
14+
- converted_to_draft
15+
- ready_for_review
16+
branches:
17+
- develop
18+
19+
jobs:
20+
Validate:
21+
runs-on: ubuntu-latest
22+
steps:
23+
- uses: 10up/action-repo-automator@trunk
24+
with:
25+
fail-label: needs:feedback
26+
pass-label: needs:code-review
27+
conflict-label: needs:refresh
28+
reviewers: |
29+
peterwilsoncc
30+
team:open-source-practice
31+
env:
32+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/wordpress-latest.yml renamed to .github/workflows/wordpress-version-checker.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@ on:
1010
schedule:
1111
- cron: '0 0 * * 1'
1212

13+
permissions:
14+
issues: write
15+
1316
jobs:
1417
wordpress-version-checker:
1518
runs-on: ubuntu-latest
1619
steps:
1720
- name: WordPress version checker
18-
uses: skaut/wordpress-version-checker@v1.2.0
21+
uses: skaut/wordpress-version-checker@master
1922
with:
2023
repo-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ tests/cypress/reports
88

99
.wp-env.override.json
1010
.phpunit.result.cache
11+
.github/.DS_Store

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v20.11.0

.wordpress-version-checker.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"channel": "rc"
3+
}

CHANGELOG.md

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

55
## [Unreleased] - TBD
66

7+
## [1.4.4] - 2024-06-26
8+
### Added
9+
- Placeholder record can be added with no authorized sellers or buyers (props [@ankitrox](https://github.com/ankitrox), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#129](https://github.com/10up/ads-txt/pull/129)).
10+
11+
### Changed
12+
- Bump WordPress "tested up to" version 6.5 (props [@zamanq](https://github.com/zamanq), [@QAharshalkadu](https://github.com/QAharshalkadu), [@jeffpaul](https://github.com/jeffpaul), [@qasumitbagthariya](https://github.com/qasumitbagthariya), [@sudip-md](https://github.com/sudip-md) via [#152](https://github.com/10up/ads-txt/pull/152), [#156](https://github.com/10up/ads-txt/pull/156), [#162](https://github.com/10up/ads-txt/issues/162)).
13+
14+
### Fixed
15+
- Better error handling for environments that don't match our minimum PHP version (props [@dkotter](https://github.com/dkotter), [@rahulsprajapati](https://github.com/rahulsprajapati), [@peterwilsoncc](https://github.com/peterwilsoncc), [@frankiebordone](https://github.com/frankiebordone), [@vikrampm1](https://github.com/vikrampm1) via [#149](https://github.com/10up/ads-txt/pull/149)).
16+
17+
### Security
18+
- Bump `semver` from 7.3.5 to 7.5.3 (props [@dependabot](https://github.com/apps/dependabot), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#147](https://github.com/10up/ads-txt/pull/147)).
19+
20+
### Developer
21+
- Added Repo Automator GitHub Action (props [@iamdharmesh](https://github.com/iamdharmesh) via [#167](https://github.com/10up/ads-txt/pull/167)).
22+
- Added a "Testing" section in the `CONTRIBUTING.md` file (props [@kmgalanakis](https://github.com/kmgalanakis), [@jeffpaul](https://github.com/jeffpaul) via [#166](https://github.com/10up/ads-txt/pull/166)).
23+
- Cleaned up NPM dependencies and update node to v20 (props [@Sidsector9](https://github.com/Sidsector9), [@dkotter](https://github.com/dkotter) via [#161](https://github.com/10up/ads-txt/pull/161)).
24+
- Updated the `skaut/wordpress-version-checker` to check WordPress "tested up to" during the Release Candidate phase (props [@jeffpaul](https://github.com/jeffpaul), [@iamdharmesh](https://github.com/iamdharmesh) via [#145](https://github.com/10up/ads-txt/pull/145)).
25+
- Upgraded the `download-artifact` from v3 to v4 (props [@iamdharmesh](https://github.com/iamdharmesh) via [#163](https://github.com/10up/ads-txt/pull/163)).
26+
- Replaced `lee-dohm/no-response` with `actions/stale` to help with closing no-response/stale issues (props [@jeffpaul](https://github.com/jeffpaul) via [#164](https://github.com/10up/ads-txt/pull/164)).
27+
- Bumped `Cypress` version from 11.2.0 to 13.2.0 (props [@iamdharmesh](https://github.com/iamdharmesh), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#154](https://github.com/10up/ads-txt/pull/154)).
28+
- Bumped `@wordpress/env` version from 5.7.0 to 8.7.0 (props [@iamdharmesh](https://github.com/iamdharmesh), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#154](https://github.com/10up/ads-txt/pull/154)).
29+
- Bumped `cypress-mochawesome-reporter` version 3.4.0 to 3.6.0 (props [@iamdharmesh](https://github.com/iamdharmesh), [@peterwilsoncc](https://github.com/peterwilsoncc) via [#154](https://github.com/10up/ads-txt/pull/154)).
30+
731
## [1.4.3] - 2023-06-21
832
### Added
933
- `ads.txt` file exists check from the backend (props [@sksaju](https://github.com/sksaju), [@peterwilsoncc](https://github.com/peterwilsoncc), [@mmcachran](https://github.com/mmcachran), [@dinhtungdu](https://github.com/dinhtungdu), [@helen](https://github.com/helen), [@jeffpaul](https://github.com/jeffpaul) via [#131](https://github.com/10up/ads-txt/pull/131)).
@@ -102,6 +126,7 @@ All notable changes to this project will be documented in this file, per [the Ke
102126
- Initial plugin release
103127

104128
[Unreleased]: https://github.com/10up/ads-txt/compare/trunk...develop
129+
[1.4.4]: https://github.com/10up/ads-txt/compare/1.4.3...1.4.4
105130
[1.4.3]: https://github.com/10up/ads-txt/compare/1.4.2...1.4.3
106131
[1.4.2]: https://github.com/10up/ads-txt/compare/1.4.1...1.4.2
107132
[1.4.1]: https://github.com/10up/ads-txt/compare/1.4.0...1.4.1

0 commit comments

Comments
 (0)