Skip to content

Commit

Permalink
Merge branch 'develop' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffpaul committed Jun 26, 2024
2 parents be7c4df + a34744e commit ce69969
Show file tree
Hide file tree
Showing 26 changed files with 1,539 additions and 3,425 deletions.
8 changes: 1 addition & 7 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,7 @@
/tests export-ignore
/vendor export-ignore

/.gitattributes export-ignore
/.gitignore export-ignore
/.phpcs.xml.dist export-ignore
/.phpcompat.xml.dist export-ignore
/.phpunit.result.cache export-ignore
/.wp-env.json export-ignore
/.wp-env.override.json export-ignore
/.* export-ignore
/CHANGELOG.md export-ignore
/CODE_OF_CONDUCT.md export-ignore
/composer.json export-ignore
Expand Down
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 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.
* @peterwilsoncc
# 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.
* @jeffpaul @dkotter

# GitHub and WordPress.org specifics
/.github/ @jeffpaul
Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,36 @@
name: No Response
name: 'Close stale issues'

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

on:
issue_comment:
types: [created]
schedule:
# Schedule for five minutes after the hour, every hour
- cron: '5 * * * *'
# Schedule for every day at 1:30am UTC
- cron: '30 1 * * *'

permissions:
issues: write

jobs:
noResponse:
stale:
runs-on: ubuntu-latest
steps:
- uses: lee-dohm/[email protected]
- uses: actions/stale@v9
with:
token: ${{ github.token }}
daysUntilClose: 14 # Number of days of inactivity before an Issue is closed for lack of response
responseRequiredLabel: "needs:feedback" # Label indicating that a response from the original author is required
closeComment: >
days-before-stale: 7
days-before-close: 7
stale-issue-message: >
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.
close-issue-message: >
This issue has been automatically closed because there has been no response
to our request for more information. With only the
information that is currently in the issue, we don't have enough information
to take action. Please reach out if you have or find the answers we need so
that we can investigate further. See [this blog post on bug reports and the
importance of repro steps](https://www.lee-dohm.com/2015/01/04/writing-good-bug-reports/)
for more information about the kind of information that may be helpful.
stale-issue-label: 'stale'
close-issue-reason: 'not_planned'
any-of-labels: 'needs:feedback'
remove-stale-when-updated: true

6 changes: 3 additions & 3 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
matrix:
core:
- {name: 'WP latest', version: 'latest'}
- {name: 'WP minimum', version: 'WordPress/WordPress#5.7'}
- {name: 'WP minimum', version: 'WordPress/WordPress#6.3'}
- {name: 'WP trunk', version: 'WordPress/WordPress#master'}
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Download build zip
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ github.event.repository.name }}
path: ${{ github.event.repository.name }}
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
npx mochawesome-report-generator tests/cypress/reports/mochawesome.json -o tests/cypress/reports/
cat ./tests/cypress/reports/mochawesome.md >> $GITHUB_STEP_SUMMARY
- name: Make artifacts available
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: cypress-artifact
Expand Down
32 changes: 32 additions & 0 deletions .github/workflows/repo-automator.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: 'Repo Automator'
on:
issues:
types:
- opened
push:
branches:
- develop
pull_request:
types:
- opened
- edited
- synchronize
- converted_to_draft
- ready_for_review
branches:
- develop

jobs:
Validate:
runs-on: ubuntu-latest
steps:
- uses: 10up/action-repo-automator@trunk
with:
fail-label: needs:feedback
pass-label: needs:code-review
conflict-label: needs:refresh
reviewers: |
peterwilsoncc
team:open-source-practice
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ on:
schedule:
- cron: '0 0 * * 1'

permissions:
issues: write

jobs:
wordpress-version-checker:
runs-on: ubuntu-latest
steps:
- name: WordPress version checker
uses: skaut/wordpress-version-checker@v1.2.0
uses: skaut/wordpress-version-checker@master
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ tests/cypress/reports

.wp-env.override.json
.phpunit.result.cache
.github/.DS_Store
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v20.11.0
3 changes: 3 additions & 0 deletions .wordpress-version-checker.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"channel": "rc"
}
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,30 @@ All notable changes to this project will be documented in this file, per [the Ke

## [Unreleased] - TBD

## [1.4.4] - 2024-06-26
### Added
- 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)).

### Changed
- 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)).

### Fixed
- 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)).

### Security
- 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)).

### Developer
- Added Repo Automator GitHub Action (props [@iamdharmesh](https://github.com/iamdharmesh) via [#167](https://github.com/10up/ads-txt/pull/167)).
- 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)).
- 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)).
- 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)).
- Upgraded the `download-artifact` from v3 to v4 (props [@iamdharmesh](https://github.com/iamdharmesh) via [#163](https://github.com/10up/ads-txt/pull/163)).
- 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)).
- 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)).
- 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)).
- 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)).

## [1.4.3] - 2023-06-21
### Added
- `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)).
Expand Down Expand Up @@ -102,6 +126,7 @@ All notable changes to this project will be documented in this file, per [the Ke
- Initial plugin release

[Unreleased]: https://github.com/10up/ads-txt/compare/trunk...develop
[1.4.4]: https://github.com/10up/ads-txt/compare/1.4.3...1.4.4
[1.4.3]: https://github.com/10up/ads-txt/compare/1.4.2...1.4.3
[1.4.2]: https://github.com/10up/ads-txt/compare/1.4.1...1.4.2
[1.4.1]: https://github.com/10up/ads-txt/compare/1.4.0...1.4.1
Expand Down
15 changes: 10 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ Pull requests represent a proposed solution to a specified problem. They should

For more on how 10up writes and manages code, check out our [10up Engineering Best Practices](https://10up.github.io/Engineering-Best-Practices/).

### Testing

Helping to test an open source project and provide feedback on success or failure of those tests is also a helpful contribution. You can find details on the Critical Flows and Test Cases in [this project's GitHub Wiki](https://github.com/10up/ads-txt/wiki) as well as details on our overall approach to [Critical Flows and Test Cases in our Open Source Best Practices](https://10up.github.io/Open-Source-Best-Practices/testing/#critial-flows). Submitting the results of testing via our Critical Flows as a comment on a Pull Request of a specific feature or as an Issue when testing the entire project is the best approach for providing testing results.

## Maintenance process

### Triage
Expand Down Expand Up @@ -90,8 +94,9 @@ Line 10: f08c47fec0942 does not appear to be a valid TAG-ID
8. Push: Push your `trunk` branch to GitHub (e.g. `git push origin trunk`).
9. [Compare](https://github.com/10up/ads-txt/compare/trunk...develop) trunk to develop to ensure no additional changes were missed.
10. Test the pre-release ZIP locally by [downloading](https://github.com/10up/ads-txt/actions/workflows/build-release-zip.yml) it from the Build release zip action artifact and installing it locally. Ensure this zip has all the files we expect, that it installs and activates correctly and that all basic functionality is working.
11. Release: Create a [new release](https://github.com/10up/ads-txt/releases/new), naming the tag and the release with the new version number, and targeting the `trunk` branch. Paste the changelog from `CHANGELOG.md` into the body of the release and include a link to the closed issues on the `X.Y.Z` milestone (e.g. <https://github.com/10up/ads-txt/milestone/1?closed=1>).
12. SVN: Wait for the [GitHub Action](https://github.com/10up/ads-txt/actions) to finish deploying to the WordPress.org repository. If all goes well, users with SVN commit access for that plugin will receive an emailed diff of changes.
13. Check WordPress.org: Ensure that the changes are live on [WordPress.org](https://wordpress.org/plugins/ads-txt/). This may take a few minutes.
14. Close milestone: Edit the [X.Y.Z milestone](https://github.com/10up/ads-txt/milestone/#) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description` field), then close the milestone.
15. Punt incomplete items: If any open issues or PRs which were milestoned for `X.Y.Z` do not make it into the release, update their milestone to `X.Y.Z+1`, `X.Y+1.0`, `X+1.0.0` or `Future Release`.
11. Either perform a regression testing utilizing the available [Critical Flows](https://10up.github.io/Open-Source-Best-Practices/testing/#critical-flows) and Test Cases or if [end-to-end tests](https://10up.github.io/Open-Source-Best-Practices/testing/#e2e-testing) cover a significant portion of those Critical Flows then run e2e tests. Only proceed if everything tests successfully.
12. Release: Create a [new release](https://github.com/10up/ads-txt/releases/new), naming the tag and the release with the new version number, and targeting the `trunk` branch. Paste the changelog from `CHANGELOG.md` into the body of the release and include a link to the closed issues on the `X.Y.Z` milestone (e.g. <https://github.com/10up/ads-txt/milestone/1?closed=1>).
13. SVN: Wait for the [GitHub Action](https://github.com/10up/ads-txt/actions) to finish deploying to the WordPress.org repository. If all goes well, users with SVN commit access for that plugin will receive an emailed diff of changes.
14. Check WordPress.org: Ensure that the changes are live on [WordPress.org](https://wordpress.org/plugins/ads-txt/). This may take a few minutes.
15. Close milestone: Edit the [X.Y.Z milestone](https://github.com/10up/ads-txt/milestone/#) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description` field), then close the milestone.
16. Punt incomplete items: If any open issues or PRs which were milestoned for `X.Y.Z` do not make it into the release, update their milestone to `X.Y.Z+1`, `X.Y+1.0`, `X+1.0.0` or `Future Release`.
2 changes: 1 addition & 1 deletion CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The following individuals are responsible for curating the list of issues, respo

Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc.

[10up (@10up)](https://github.com/10up), [Helen Hou-Sandi (@helen)](https://github.com/helen), [Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [Scott Buscemi (@scottbuscemi)](https://github.com/scottbuscemi), [John Eckman (@jeckman)](https://github.com/jeckman), [philipjohn (@philipjohn)](https://github.com/philipjohn), [Keanan Koppenhaver (@kkoppenhaver)](https://github.com/kkoppenhaver), [vtellapmc (@vtellapmc)](https://github.com/vtellapmc), [Tom J. Nowell (@tomjn)](https://github.com/tomjn), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Ethan Clevenger (@ethanclevenger91)](https://github.com/ethanclevenger91), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Peter Westwood (@westi)](https://github.com/westi), [Matthew McAchran (@mmcachran)](https://github.com/mmcachran), [Stephanie Walters (@PypWalters)](https://github.com/PypWalters), [Barney Jeffries (@barneyjeffries)](https://github.com/barneyjeffries), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Ramon Ahnert (@Rahmon)](https://github.com/Rahmon), [EVOKE (@evokelektrique)](https://github.com/evokelektrique), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Max Lyuchin (@cadic)](https://github.com/cadic), [Vikram Moparthy (@vikrampm1)](https://github.com/vikrampm1), [Jayedul Kabir (@jayedul)](https://github.com/jayedul), [Thorsten Ott (@tott)](https://github.com/tott), [Sascha Greuel (@SoftCreatR)](https://github.com/SoftCreatR), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Jake Goldman (@jakemgold)](https://github.com/jakemgold), [cp101 (@p0mmy)](https://github.com/p0mmy), [Ivan Kruchkoff (@ivankruchkoff)](https://github.com/ivankruchkoff), [Ankit K. Gupta (@ankitguptaindia)](https://github.com/ankitguptaindia), [Tim Moore (@tmoorewp)](https://github.com/tmoorewp), [Per Søderlind (@soderlind)](https://github.com/soderlind), [Daryll Doyle (@darylldoyle)](https://github.com/darylldoyle), [Mohit Dadhich (@mohitwp)](https://github.com/mohitwp), [RoeyHarari44 (@RoeyHarari44)](https://github.com/RoeyHarari44), [Dhanendran Rajagopal (@dhanendran)](https://github.com/dhanendran), [Shazahan Kabir Saju (@sksaju)](https://github.com/sksaju)
[10up (@10up)](https://github.com/10up), [Helen Hou-Sandi (@helen)](https://github.com/helen), [Adam Silverstein (@adamsilverstein)](https://github.com/adamsilverstein), [Scott Buscemi (@scottbuscemi)](https://github.com/scottbuscemi), [John Eckman (@jeckman)](https://github.com/jeckman), [philipjohn (@philipjohn)](https://github.com/philipjohn), [Keanan Koppenhaver (@kkoppenhaver)](https://github.com/kkoppenhaver), [vtellapmc (@vtellapmc)](https://github.com/vtellapmc), [Tom J. Nowell (@tomjn)](https://github.com/tomjn), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Ethan Clevenger (@ethanclevenger91)](https://github.com/ethanclevenger91), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Peter Westwood (@westi)](https://github.com/westi), [Matthew McAchran (@mmcachran)](https://github.com/mmcachran), [Stephanie Walters (@PypWalters)](https://github.com/PypWalters), [Barney Jeffries (@barneyjeffries)](https://github.com/barneyjeffries), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Ramon Ahnert (@Rahmon)](https://github.com/Rahmon), [EVOKE (@evokelektrique)](https://github.com/evokelektrique), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Max Lyuchin (@cadic)](https://github.com/cadic), [Vikram Moparthy (@vikrampm1)](https://github.com/vikrampm1), [Jayedul Kabir (@jayedul)](https://github.com/jayedul), [Thorsten Ott (@tott)](https://github.com/tott), [Sascha Greuel (@SoftCreatR)](https://github.com/SoftCreatR), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Jake Goldman (@jakemgold)](https://github.com/jakemgold), [cp101 (@p0mmy)](https://github.com/p0mmy), [Ivan Kruchkoff (@ivankruchkoff)](https://github.com/ivankruchkoff), [Ankit K. Gupta (@ankitguptaindia)](https://github.com/ankitguptaindia), [Tim Moore (@tmoorewp)](https://github.com/tmoorewp), [Per Søderlind (@soderlind)](https://github.com/soderlind), [Daryll Doyle (@darylldoyle)](https://github.com/darylldoyle), [Mohit Dadhich (@mohitwp)](https://github.com/mohitwp), [RoeyHarari44 (@RoeyHarari44)](https://github.com/RoeyHarari44), [Dhanendran Rajagopal (@dhanendran)](https://github.com/dhanendran), [Shazahan Kabir Saju (@sksaju)](https://github.com/sksaju), [Ankit Gade (@ankitrox)](https://github.com/ankitrox), [Quamruz Zaman (@zamanq)](https://github.com/zamanq), [Harshal Kadu (@QAharshalkadu)](https://github.com/QAharshalkadu), [Sumit Bagthariya (@qasumitbagthariya)](https://github.com/qasumitbagthariya), [Sudip Dadhaniya (@sudip-md)](https://github.com/sudip-md), [Rahul Prajapati (@rahulsprajapati)](https://github.com/rahulsprajapati), [Frankie Bordone (@frankiebordone)](https://github.com/frankiebordone), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Konstantinos Galanakis (@kmgalanakis)](https://github.com/kmgalanakis).

## Libraries

Expand Down
Loading

0 comments on commit ce69969

Please sign in to comment.