Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the readme and amp.php for the 1.0.1 release #1734

Merged
merged 9 commits into from
Dec 13, 2018
Merged

Update the readme and amp.php for the 1.0.1 release #1734

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cce76d0
Add 1.0.1 PRs and issue to the changelog, add date
kienstra Dec 12, 2018
00ce096
Change the links to wiki pages to point to the product site
kienstra Dec 12, 2018
2cfbbcd
Bump versions in amp.php from 1.0.1-alpha1 to 1.0.1
kienstra Dec 12, 2018
46f47ef
Bump the 'Stable tag' from 1.0.0
kienstra Dec 12, 2018
0c52328
Link to the release instead of the milestone
kienstra Dec 12, 2018
3b582a8
Regenrate the readme after udating the dev-lib submodule
kienstra Dec 12, 2018
7a1f0f7
Add contribution section about branches; add build step
westonruter Dec 13, 2018
f955432
Remove grunt-contrib-jshint from deploy step
westonruter Dec 13, 2018
7fd204b
Improve contributing instructions
westonruter Dec 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions contributing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ again.

The list of contributors who are featured on the WordPress.org plugin directory are subject to change over time. The organizations and individuals who contribute significantly and consistently (e.g. 3-month period) to the project are eligible to be listed. Those listed should generally be considered as those who take responsibility for the project (i.e. owners). Note that contributions include more than just code, though contributors who commit are [most visible](https://github.com/ampproject/amp-wp/graphs/contributors). The sort order of the contributors list should generally follow the sort order of the GitHub contributors page, though again, this order does not consider work in issues and the support forum, so it cannot be relied on solely.

## Branches

To include your changes in the next patch release (e.g. `1.0.x`), please base your branch off of the current release branch (e.g. `1.0`) and open your pull request back to that branch. If you open your pull request with the `develop` branch then it will be by default included in the next minor version (e.g. `1.x`).
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea, this should prevent having to rebase branches.


## Code Reviews

All submissions, including submissions by project members, require review. We
Expand Down Expand Up @@ -134,6 +138,7 @@ When you push a commit to your PR, Travis CI will run the PHPUnit tests and snif

Contributors who want to make a new release, follow these steps:

0. Do `git submodule update --init --recursive && npm install && composer selfupdate && composer install && wp cli update`.
1. Do `npm run build` and install the `amp.zip` onto a normal WordPress install running a stable release build; do smoke test to ensure it works.
2. Bump plugin versions in `amp.php` (×2: the metadata block in the header and also the `AMP__VERSION` constant).
3. Add changelog entry to readme.
Expand Down