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.

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

Release/1.0.3 #105

Merged
merged 23 commits into from
Jul 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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
16 changes: 6 additions & 10 deletions .distignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
# Directories
/.wordpress-org
/.git
/.github
/.babelrc
/.eslintignore
/phpcs.xml
/node_modules
/tests
/.wordpress-org
/bin
/phpunit.xml
/tests

# Files
.babelrc
Expand All @@ -18,15 +13,16 @@
.gitignore
CHANGELOG.md
CODE_OF_CONDUCT.md
composer.json
composer.lock
CONTRIBUTING.md
CREDITS.md
LICENSE.md
README.md
composer.json
composer.lock
package-lock.json
package.json
phpcs.xml
phpunit.xml
README.md
webpack.config.js
webpack.gutenberg.config.js
wpacceptance.json
22 changes: 17 additions & 5 deletions .github/workflows/deploy-to-wpdotorg.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: Deploy to WordPress.org
on:
push:
tags:
- "*"
release:
types: [published]
jobs:
tag:
name: New tag
name: New release
runs-on: ubuntu-latest
steps:
- name: Checkout code
- uses: actions/checkout@master
- name: Build
run: |
Expand All @@ -16,7 +16,19 @@ jobs:
npm run build:externals
composer install -o --no-dev
- name: WordPress Plugin Deploy
uses: 10up/action-wordpress-plugin-deploy@master
id: deploy
uses: 10up/action-wordpress-plugin-deploy@stable
with:
generate-zip: true
env:
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
- name: Upload release asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: ${{github.workspace}}/${{ github.event.repository.name }}.zip
asset_name: ${{ github.event.repository.name }}.zip
asset_content_type: application/zip
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches:
- develop
- master
- trunk
pull_request:
branches:
- develop
Expand All @@ -28,7 +28,7 @@ jobs:

with:
job-name: eslint

test_php:
runs-on: ubuntu-latest
services:
Expand All @@ -42,7 +42,7 @@ jobs:
strategy:
matrix:
php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3']

steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/update-wpdororg-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ name: Plugin asset/readme update
on:
push:
branches:
- master
- trunk
jobs:
master:
name: Push to master
trunk:
name: Push to trunk
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: WordPress.org plugin asset/readme update
uses: 10up/action-wordpress-plugin-asset-update@master
uses: 10up/action-wordpress-plugin-asset-update@stable
env:
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
20 changes: 16 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,25 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased] - TBD

## [1.0.3] - TBD
### Added
- `autoshare_for_twitter_disable_on_transition_post_status` filter to disable tweeting based on post status change (props [@rickalee](https://github.com/rickalee) via [#99](https://github.com/10up/autoshare-for-twitter/pull/99))

### Changed
- Bumped WordPress version support to 5.4.2 (props [@dinhtungdu](https://github.com/dinhtungdu), [@jeffpaul](https://github.com/jeffpaul/) via [#106](https://github.com/10up/autoshare-for-twitter/pull/106))
- Build, test, and release processes (props [@johnwatkins0](https://github.com/johnwatkins0), [@dinhtungdu](https://github.com/dinhtungdu) via [#96](https://github.com/10up/autoshare-for-twitter/pull/96), [#97](https://github.com/10up/autoshare-for-twitter/pull/97), [#98](https://github.com/10up/autoshare-for-twitter/pull/98), [#101](https://github.com/10up/autoshare-for-twitter/pull/101))

### Fixed
- Enable autoshare meta always set to 0 when saving draft (props [@dinhtungdu](https://github.com/dinhtungdu), [@rickalee](https://github.com/rickalee) via [#103](https://github.com/10up/autoshare-for-twitter/pull/103))

## [1.0.2] - 2020-03-12
## Added
### Added
- WP Acceptance tests (props [@johnwatkins0](https://github.com/johnwatkins0) via [#84](https://github.com/10up/autoshare-for-twitter/pull/84))

## Changed
### Changed
- New and improved settings page UX (props [@dinhtungdu](https://github.com/dinhtungdu), [@jeffpaul](https://github.com/jeffpaul/), [@johnwatkins0](https://github.com/johnwatkins0), [@linawiezkowiak](https://github.com/linawiezkowiak), [@oszkarnagy](https://github.com/oszkarnagy) via [#78](https://github.com/10up/autoshare-for-twitter/pull/78))

## Fixed
### Fixed
- Bug that caused posts to be inadvertently tweeted when switching from draft to publish (props [@johnwatkins0](https://github.com/johnwatkins0), [@rickalee](https://github.com/rickalee) via [#82](https://github.com/10up/autoshare-for-twitter/pull/82))
- Build script in release process (props [@johnwatkins0](https://github.com/johnwatkins0) via [#77](https://github.com/10up/autoshare-for-twitter/pull/77))

Expand Down Expand Up @@ -45,7 +56,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [0.1.0] - 2018-05-11
- Initial closed source release (props [@scottlee](https://github.com/scottlee/))

[Unreleased]: https://github.com/10up/autoshare-for-twitter/compare/master...develop
[Unreleased]: https://github.com/10up/autoshare-for-twitter/compare/trunk...develop
[1.0.3]: https://github.com/10up/autoshare-for-twitter/compare/1.0.2...1.0.3
[1.0.2]: https://github.com/10up/autoshare-for-twitter/compare/1.0.1...1.0.2
[1.0.1]: https://github.com/10up/autoshare-for-twitter/compare/1.0.0...1.0.1
[1.0.0]: https://github.com/10up/autoshare-for-twitter/compare/1020035...1.0.0
Expand Down
31 changes: 15 additions & 16 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,22 @@ For more on how 10up writes and manages code, check out our [10up Engineering Be

## Workflow

The `develop` branch is the development branch which means it contains the next version to be released. `stable` contains the current latest release and `master` contains the corresponding stable development version. Always work on the `develop` branch and open up PRs against `develop`.
The `develop` branch is the development branch which means it contains the next version to be released. `stable` contains the current latest release and `trunk` contains the corresponding stable development version. Always work on the `develop` branch and open up PRs against `develop`.

## Release instructions

1. Branch: Starting from `develop`, cut a release branch named `release/X.Y.Z` for your changes.
2. Version bump: Bump the version number in `autoshare-for-twitter.php`, `readme.txt`, `composer.json`, `package-lock.json`, and `package.json` if it does not already reflect the version being released.
3. Changelog: Add/update the changelog in `CHANGELOG.md` and `readme.txt`.
4. Props: update `CREDITS.md` with any new contributors, confirm maintainers are accurate.
5. Translations: Update the `.pot` file by running `npm run makepot`.
6. New files: Check to be sure any new files/paths that are unnecessary in the production version are included in `.distignore`.
7. Readme updates: Make any other readme changes as necessary. `CHANGELOG.md` and `README.md` are geared toward GitHub and `readme.txt` contains WordPress.org-specific content. The two are slightly different.
8. Merge: Make a non-fast-forward merge from your release branch to `develop` (or merge the pull request), then do the same for `develop` into `master` (`git checkout master && git merge --no-ff develop`). `master` contains the stable development version.
9. Push: Push your `master` branch to GitHub (e.g. `git push origin master`).
10. [Wait for build](https://xkcd.com/303/): Head to the [Actions](https://github.com/10up/autoshare-for-twitter/actions) tab in the repo and wait for it to finish if it hasn't already. If it doesn't succeed, figure out why and start over.
11. Check the build: Check out the `stable` branch and test for functionality locally.
12. Release: Create a [new release](https://github.com/10up/autoshare-for-twitter/releases/new), naming the tag and the release with the new version number, and targeting the `stable` branch. Paste the changelog from `CHANGELOG.md` into the body of the release and include a link to the closed issues on the [1.0.1 milestone](https://github.com/10up/autoshare-for-twitter/milestone/3?closed=1).
13. SVN: Wait for the [GitHub Action](https://github.com/10up/autoshare-for-twitter/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 https://wordpress.org/plugins/autoshare-for-twitter/. This may take a few minutes.
15. Close the milestone: Edit the [X.Y.Z milestone](https://github.com/10up/autoshare-for-twitter/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+1.0.0`, `X.Y+1.0`, `X.Y.Z+1`, or `Future Release`
1. Version bump: Bump the version number in `autoshare-for-twitter.php`, `readme.txt`, `package-lock.json`, and `package.json` if it does not already reflect the version being released.
1. Changelog: Add/update the changelog in `CHANGELOG.md` and `readme.txt`.
1. Props: update `CREDITS.md` with any new contributors, confirm maintainers are accurate.
1. New files: Check to be sure any new files/paths that are unnecessary in the production version are included in `.distignore`.
1. Readme updates: Make any other readme changes as necessary. `README.md` are geared toward GitHub and `readme.txt` contains WordPress.org-specific content. The two are slightly different.
1. Merge: Make a non-fast-forward merge from your release branch to `develop` (or merge the pull request), then do the same for `develop` into `trunk` (`git checkout trunk && git merge --no-ff develop`). `trunk` contains the stable development version.
1. Push: Push your `trunk` branch to GitHub (e.g. `git push origin trunk`).
1. [Wait for build](https://xkcd.com/303/): Head to the [Actions](https://github.com/10up/autoshare-for-twitter/actions) tab in the repo and wait for it to finish if it hasn't already. If it doesn't succeed, figure out why and start over.
1. Check the build: Check out the `stable` branch and test for functionality locally.
1. Release: Create a [new release](https://github.com/10up/autoshare-for-twitter/releases/new), naming the tag and the release with the new version number, and targeting the `stable` branch. Paste the changelog from `CHANGELOG.md` into the body of the release and include a link to the [closed issues on the milestone](https://github.com/10up/autoshare-for-twitter/milestone/3?closed=1).
1. SVN: Wait for the [GitHub Action](https://github.com/10up/autoshare-for-twitter/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.
1. Check WordPress.org: Ensure that the changes are live on https://wordpress.org/plugins/autoshare-for-twitter/. This may take a few minutes.
1. Close the milestone: Edit the [milestone](https://github.com/10up/autoshare-for-twitter/milestone/#) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description` field), then close the milestone.
1. 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+1.0.0`, `X.Y+1.0`, `X.Y.Z+1`, or `Future Release`
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ function enable_autoshare_by_default_for_core_post_type( $enabled, $post_type )
add_filter( 'autoshare_for_twitter_enabled_default', 'enable_autoshare_by_default_for_core_post_type', 10, 2 );
```


## Plugin Compatibility

### Distributor
Expand All @@ -52,8 +51,8 @@ add_filter( 'dt_blacklisted_meta', function( $blacklisted_metas ) {

## Requirements

- PHP 7.0+
- [WordPress](http://wordpress.org) 4.7+
- PHP 7.0+
- [WordPress](http://wordpress.org) 4.7+

## Installation

Expand All @@ -65,7 +64,7 @@ add_filter( 'dt_blacklisted_meta', function( $blacklisted_metas ) {

### Does this plugin work with Gutenberg?

Yes, yes it does! For more details on this, see #44.
Yes, yes it does! For more details on this, see [#44](https://github.com/10up/autoshare-for-twitter/pull/44).

## Support Level

Expand All @@ -81,4 +80,4 @@ Please read [CODE_OF_CONDUCT.md](https://github.com/10up/autoshare-for-twitter/b

## Like what you see?

<a href="http://10up.com/contact/"><img src="https://10updotcom-wpengine.s3.amazonaws.com/uploads/2016/10/10up-Github-Banner.png" width="850" alt="Work with us at 10up"></a>
<a href="http://10up.com/contact/"><img src="https://10up.com/uploads/2016/10/10up-Github-Banner.png" width="850" alt="Work with us at 10up"></a>
5 changes: 3 additions & 2 deletions autoshare-for-twitter.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
* Plugin Name: Autoshare for Twitter
* Description: Automatically tweets the post title or custom message and a link to the post.
* Disclaimer: TWITTER, TWEET, RETWEET and the Twitter logo are trademarks of Twitter, Inc. or its affiliates.
* Version: 1.0.2
* Version: 1.0.3
* Requires at least: 4.7
* Requires PHP: 7.0
* Author: 10up
* Author URI: https://10up.com
* License: GPL-2.0-or-later
* License URI: https://spdx.org/licenses/GPL-2.0-or-later.html
* Text Domain: autoshare-for-twitter
*
* @package TenUp\AutoshareForTwitter
*/
Expand All @@ -19,7 +20,7 @@
}

define( 'AUTOSHARE_FOR_TWITTER', __FILE__ );
define( 'AUTOSHARE_FOR_TWITTER_VERSION', '1.0.2' );
define( 'AUTOSHARE_FOR_TWITTER_VERSION', '1.0.3' );
define( 'AUTOSHARE_FOR_TWITTER_URL', plugin_dir_url( __FILE__ ) );
define( 'AUTOSHARE_FOR_TWITTER_PATH', plugin_dir_path( __FILE__ ) );
define( 'AUTOSHARE_FOR_TWITTER_INC', AUTOSHARE_FOR_TWITTER_PATH . 'includes/' );
Expand Down
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
{
"name": "10up/autoshare-for-twitter",
"description": "",
"version": "1.0.2",
"description": "Automatically tweets the post title or custom message and a link to the post.",
"type": "wordpress-plugin",
"keywords": [],
"homepage": "https://10up.com",
"license": "GPL-2.0+",
"license": "GPL-2.0-or-later",
"authors": [
{
"name": "10up",
Expand Down
Loading