From 3708511a8545de2602f920cbfaaee3249770cdd5 Mon Sep 17 00:00:00 2001 From: 10upbot on GitHub <10upbot+github@10up.com> Date: Tue, 26 Jul 2022 01:08:11 +0000 Subject: [PATCH 1/2] Committing built version of 1e4ad8192ca5453cda1dcf462224db4bc8d7baba --- .github/workflows/build-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index 3f1c26208..7f9ac6d45 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -25,4 +25,4 @@ jobs: uses: peaceiris/actions-gh-pages@v3 with: github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: './docs' + publish_dir: './docs-built' From 765bf38888764760de2432220254d678f3a18758 Mon Sep 17 00:00:00 2001 From: 10upbot on GitHub <10upbot+github@10up.com> Date: Thu, 4 Aug 2022 18:19:12 +0000 Subject: [PATCH 2/2] Committing built version of 669172365744c7ad71b480aca667dc9045877ae6 --- .github/workflows/cypress.yml | 46 +++++++++++++++++++++++++++++++++++ .github/workflows/lint.yml | 10 ++++---- CHANGELOG.md | 11 +++++++++ distributor.php | 4 +-- includes/utils.php | 3 +++ readme.txt | 2 +- 6 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/cypress.yml diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml new file mode 100644 index 000000000..d7682da91 --- /dev/null +++ b/.github/workflows/cypress.yml @@ -0,0 +1,46 @@ +name: E2E Tests + +on: + push: + branches: + - develop + - trunk + pull_request: + branches: + - develop +jobs: + cypress: + name: ${{ matrix.core.name }} + runs-on: ubuntu-latest + strategy: + matrix: + core: + - {name: 'WP latest', version: 'latest'} + - {name: 'WP minimum', version: 'WordPress/WordPress#5.2'} + - {name: 'WP trunk', version: 'WordPress/WordPress#master'} + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Check versions + run: npm -v; node -v + + - name: Install dependencies + run: npm install + + - name: Composer install + run: composer install + + - name: Set the core version + run: ./tests/bin/set-core-version.js ${{ matrix.core.version }} + + - name: Set up WP environment + run: npm run env:start + + - name: Convert to multisite + run: npm run to-multisite + + - name: Copy .htaccess + run: npm run copy-htaccess + + - name: Test + run: npm run cypress:run diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 4aeca1919..05824af0e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,11 +18,11 @@ jobs: name: eslint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.4.0 - - name: install node v12 - uses: actions/setup-node@v1 + - uses: actions/checkout@v3 + - name: install node v16 + uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 16 - name: npm install run: npm install - name: eslint @@ -37,7 +37,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2.4.0 + uses: actions/checkout@v3 - name: Set standard 10up cache directories run: | diff --git a/CHANGELOG.md b/CHANGELOG.md index 23ca8cbb5..6ce49d0a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file, per [the Ke ## [Unreleased] - TBD +## [1.7.1] - 2022-08-04 + +### Added + +- Cypress E2E tests (props [@dkotter](https://github.com/dkotter), [@faisal-alvi](https://github.com/faisal-alvi), [@dinhtungdu](https://github.com/dinhtungdu), [@iamdharmesh](https://github.com/iamdharmesh), [@Sidsector9](https://github.com/Sidsector9) via [#900](https://github.com/10up/distributor/pull/900)). + +### Fixed + +- Ensure we don't lose the post_type value when pushing or pulling content (props [@dkotter](https://github.com/dkotter), [@pdewouters](https://github.com/pdewouters), [@andygagnon](https://github.com/andygagnon), [@jmstew3](https://github.com/jmstew3) via [#922](https://github.com/10up/distributor/pull/922)). + ## [1.7.0] - 2022-07-26 ### Added @@ -386,6 +396,7 @@ This adds a post type selector when viewing the Pull Content list for both exter - Initial closed release. [Unreleased]: https://github.com/10up/distributor/compare/trunk...develop +[1.7.1]: https://github.com/10up/distributor/compare/1.7.0...1.7.1 [1.7.0]: https://github.com/10up/distributor/compare/1.6.9...1.7.0 [1.6.9]: https://github.com/10up/distributor/compare/1.6.8...1.6.9 [1.6.8]: https://github.com/10up/distributor/compare/1.6.7...1.6.8 diff --git a/distributor.php b/distributor.php index f5094b66d..b8e61fa96 100644 --- a/distributor.php +++ b/distributor.php @@ -4,7 +4,7 @@ * Plugin URI: https://github.com/10up/distributor * Update URI: https://distributorplugin.com * Description: Makes it easy to distribute and reuse content across your websites, whether inside of a multisite or across the web. - * Version: 1.7.0 + * Version: 1.7.1 * Author: 10up Inc. * Author URI: https://distributorplugin.com * License: GPLv2 or later @@ -18,7 +18,7 @@ exit; // Exit if accessed directly. } -define( 'DT_VERSION', '1.7.0' ); +define( 'DT_VERSION', '1.7.1' ); define( 'DT_PLUGIN_FILE', preg_replace( '#^.*plugins/(.*)$#i', '$1', __FILE__ ) ); define( 'DT_PLUGIN_PATH', plugin_dir_path( __FILE__ ) ); diff --git a/includes/utils.php b/includes/utils.php index 3ca679c0b..4118e0f2c 100644 --- a/includes/utils.php +++ b/includes/utils.php @@ -1139,6 +1139,9 @@ function post_args_allow_list( $post_args ) { 'post_title', 'post_excerpt', 'post_status', + 'post_type', + 'comment_status', + 'ping_status', 'post_password', 'post_name', 'to_ping', diff --git a/readme.txt b/readme.txt index eda9944c8..f4f040767 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: content, distribution, syndication, management Requires at least: 4.7 Tested up to: 6.0 Requires PHP: 5.6 -Stable tag: 1.7.0 +Stable tag: 1.7.1 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html