From e86036a4c4d8ee159a3370b2e95a64347e1b2775 Mon Sep 17 00:00:00 2001 From: Renato Alves <19148962+renatonascalves@users.noreply.github.com> Date: Sun, 5 May 2024 15:28:32 -0300 Subject: [PATCH 1/6] Bumping versions pre-release --- .github/workflows/built-tag.yml | 11 ----- .github/workflows/code-quality.yml | 2 - .github/workflows/coding-standards.yml | 2 - .github/workflows/unit-tests.yml | 67 +++++++------------------- CHANGELOG.md | 16 +++--- readme.txt | 6 ++- wp-graphql-buddypress.php | 6 +-- 7 files changed, 31 insertions(+), 79 deletions(-) delete mode 100644 .github/workflows/built-tag.yml diff --git a/.github/workflows/built-tag.yml b/.github/workflows/built-tag.yml deleted file mode 100644 index e6f5c223..00000000 --- a/.github/workflows/built-tag.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: Create a -built tag - -on: - push: - tags: - - 'v*.*.*' - - '!*-built' - -jobs: - built-tag: - uses: alleyinteractive/.github/.github/workflows/built-tag.yml@main diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 0fa05196..04f94710 100644 --- a/.github/workflows/code-quality.yml +++ b/.github/workflows/code-quality.yml @@ -5,8 +5,6 @@ on: branches: - main pull_request: - schedule: - - cron: '0 0 * * *' jobs: code-quality: diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 4d12a623..e2b6af81 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -5,8 +5,6 @@ on: branches: - main pull_request: - schedule: - - cron: '0 0 * * *' jobs: coding-standards: diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index df9e36e5..9e55867e 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -5,58 +5,27 @@ on: branches: - main pull_request: - schedule: - - cron: '0 0 * * *' jobs: tests: - name: "WP: ${{ matrix.wp_version }} - PHP: ${{ matrix.php }} - (MU: ${{ matrix.multisite }})" - runs-on: ubuntu-latest + name: "WP: ${{ matrix.wp_version }} - PHP: ${{ matrix.php }}" strategy: - fail-fast: false # do not fail fast, let all the failing tests fail. + fail-fast: false matrix: php: [8.0, 8.1, 8.2, 8.3] - multisite: [0, 1] - wp_version: ['5.9', 'latest'] - env: - WP_CORE_DIR: /tmp/wordpress/ - WP_TESTS_DIR: /tmp/wordpress-tests-lib - WP_VERSION: ${{ matrix.wp_version }} - WP_MULTISITE: ${{ matrix.multisite }} - services: - mysql: - image: mysql:8.0 - env: - MYSQL_ALLOW_EMPTY_PASSWORD: yes - ports: - - 3306:3306 - options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 - steps: - - name: Cancel previous runs of this workflow (pull requests only) - if: ${{ github.event_name == 'pull_request' }} - uses: styfle/cancel-workflow-action@0.12.1 - with: - access_token: ${{ github.token }} - - - name: Check out code - uses: actions/checkout@v4 - - - name: Set up PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - tools: composer:v2 - coverage: none - - - name: Set up WordPress and Plugin - run: | - bash <(curl -s "https://raw.githubusercontent.com/wp-cli/sample-plugin/master/bin/install-wp-tests.sh") wordpress_unit_tests root '' 127.0.0.1 ${{ matrix.wp_version }} - rm -rf "${WP_CORE_DIR}wp-content/plugins" - mkdir -p "${WP_CORE_DIR}wp-content/plugins/wp-graphql-buddypress" - rsync -a --exclude=.git . "${WP_CORE_DIR}wp-content/plugins/wp-graphql-buddypress" - cd ${WP_CORE_DIR}wp-content/plugins/wp-graphql-buddypress && composer install - - - name: Run all tests - run: | - cd ${WP_CORE_DIR}wp-content/plugins/wp-graphql-buddypress - composer phpunit + multisite: [true, false] + wp_version: ['latest'] + include: + - php: '8.3' + wp_version: '6.1' + - php: '8.2' + wp_version: '6.1' + - php: '8.0' + wp_version: '6.1' + uses: alleyinteractive/.github/.github/workflows/php-tests.yml@feature/php-tests-core-suite + with: + multisite: ${{ matrix.multisite }} + php: ${{ matrix.php }} + wordpress: ${{ matrix.wp_version }} + test-suite: 'core-test-suite' + package-directory: 'plugins/wp-graphql-buddypress' diff --git a/CHANGELOG.md b/CHANGELOG.md index 5eba7019..62b371c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,17 +8,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added -- Support BuddyPress Community Visibility, "Private Site", feature [#118](https://github.com/renatonascalves/wp-graphql-buddypress/issues/118) -- Add `resendSignupEmail` mutation to resend activation email [#127](https://github.com/renatonascalves/wp-graphql-buddypress/issues/127) -- Added a `CHANGELOG.md` file -- Add list of plugin dependencies [#115](https://github.com/renatonascalves/wp-graphql-buddypress/issues/115) +- [#118](https://github.com/renatonascalves/wp-graphql-buddypress/issues/118): feat: Support BuddyPress Community Visibility, "Private Site". +- [#127](https://github.com/renatonascalves/wp-graphql-buddypress/issues/127): feat: Add `resendSignupEmail` mutation to resend activation email +- [#115](https://github.com/renatonascalves/wp-graphql-buddypress/issues/115): chore: Add list of plugin dependencies +- chore: Added a `CHANGELOG.md` file ### Updated -- Upgrade to WPCS/VIPCS 3.0 (See https://github.com/alleyinteractive/alley-coding-standards) -- Updated Github Action Matrix to test more variations. -- Supports WordPress 6.5. -- Updated CI actions to support Node 20. +- chore: Upgrade to WPCS/VIPCS 3.0 (See https://github.com/alleyinteractive/alley-coding-standards) +- chore: Supports WordPress 6.5. +- ci: Updated Github Action Matrix to test more variations. +- ci: Updated CI actions to support Node 20. ## [0.1.0] diff --git a/readme.txt b/readme.txt index de18f700..f481d924 100644 --- a/readme.txt +++ b/readme.txt @@ -1,13 +1,15 @@ === WPGraphQL BuddyPress === Contributors: espellcaste -Tags: graphql, bp graphql, wp-graphql, rest, community, api, buddypress, social networking +Tags: graphql, wp-graphql, community, buddypress License: GPL-3.0-or-later License URI: https://www.gnu.org/licenses/gpl-3.0.html Requires PHP: 8.0 -Requires at least: 5.9 +Requires at least: 6.1 Tested up to: 6.5.2 Stable tag: 0.1.1 +Get together safely, in your own way, in WordPress. + == Description == WPGraphQL BuddyPress is a free and open-source extension for the WPGraphQL plugin, bringing the power of GraphQL to BuddyPress. diff --git a/wp-graphql-buddypress.php b/wp-graphql-buddypress.php index f266e4f2..22927775 100644 --- a/wp-graphql-buddypress.php +++ b/wp-graphql-buddypress.php @@ -16,9 +16,8 @@ * Author: Renato Alves * Author URI: https://ralv.es * Text Domain: wp-graphql-buddypress - * Domain Path: /languages/ * Requires PHP: 8.0 - * Requires WP: 5.9 + * Requires WP: 6.1 * Tested up to: 6.5.2 * Requires Plugins: wp-graphql, buddypress * License: GPL-3.0-or-later @@ -77,8 +76,6 @@ public static function instance(): self { * therefore, we don't want the object to be cloned. */ public function __clone(): void { - - // Cloning instances of the class is forbidden. _doing_it_wrong( __FUNCTION__, esc_html__( @@ -93,7 +90,6 @@ public function __clone(): void { * Disable unserializing of the class. */ public function __wakeup(): void { - // De-serializing instances of the class is forbidden. _doing_it_wrong( __FUNCTION__, From 6b2a64cd944715c73dd9facb462eb768fa7f1473 Mon Sep 17 00:00:00 2001 From: Renato Alves <19148962+renatonascalves@users.noreply.github.com> Date: Sun, 5 May 2024 15:32:29 -0300 Subject: [PATCH 2/6] Update `readme.txt` with changelog items --- .phpcs.xml | 2 +- CHANGELOG.md | 3 ++- readme.txt | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.phpcs.xml b/.phpcs.xml index 5e380599..08374978 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -33,7 +33,7 @@ <config name="testVersion" value="8.0-" /> <!-- Check against minimum WP version. --> - <config name="minimum_supported_wp_version" value="5.9" /> + <config name="minimum_supported_wp_version" value="6.1" /> <!-- Name our classes files however we want. --> <rule ref="WordPress.Files.FileName"> diff --git a/CHANGELOG.md b/CHANGELOG.md index 62b371c8..7408f0cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.1.1] Unpublished +## [0.1.1] ### Added @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - chore: Supports WordPress 6.5. - ci: Updated Github Action Matrix to test more variations. - ci: Updated CI actions to support Node 20. +- ci: removed Github Action `-built-branch` action. ## [0.1.0] diff --git a/readme.txt b/readme.txt index f481d924..f19a0cb0 100644 --- a/readme.txt +++ b/readme.txt @@ -34,6 +34,23 @@ Head over to the [BuddyPress Documentation](https://codex.buddypress.org/partici == Changelog == += 0.1.1 = + +**New Features** + +- [#118](https://github.com/renatonascalves/wp-graphql-buddypress/issues/118): feat: Support BuddyPress Community Visibility, "Private Site". +- [#127](https://github.com/renatonascalves/wp-graphql-buddypress/issues/127): feat: Add `resendSignupEmail` mutation to resend activation email +- [#115](https://github.com/renatonascalves/wp-graphql-buddypress/issues/115): chore: Add list of plugin dependencies +- chore: Added a `CHANGELOG.md` file + +**Chores / Bugfixes** + +- chore: Upgrade to WPCS/VIPCS 3.0 (See https://github.com/alleyinteractive/alley-coding-standards) +- chore: Supports WordPress 6.5. +- ci: Updated Github Action Matrix to test more variations. +- ci: Updated CI actions to support Node 20. +- ci: removed Github Action `-built-branch` action. + = 0.1.0 = Public Stable Release. From 3d6fc535f37bd6de4b55e13839b300528bcd6d33 Mon Sep 17 00:00:00 2001 From: Renato Alves <19148962+renatonascalves@users.noreply.github.com> Date: Sun, 5 May 2024 15:42:33 -0300 Subject: [PATCH 3/6] Use object cache services too --- .github/workflows/unit-tests.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 9e55867e..6e737a2e 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -14,18 +14,13 @@ jobs: matrix: php: [8.0, 8.1, 8.2, 8.3] multisite: [true, false] - wp_version: ['latest'] - include: - - php: '8.3' - wp_version: '6.1' - - php: '8.2' - wp_version: '6.1' - - php: '8.0' - wp_version: '6.1' + wp_version: ['6.1', 'latest'] + object: ["memcached", "redis"] uses: alleyinteractive/.github/.github/workflows/php-tests.yml@feature/php-tests-core-suite with: multisite: ${{ matrix.multisite }} php: ${{ matrix.php }} wordpress: ${{ matrix.wp_version }} + object-cache: ${{ matrix.object }} test-suite: 'core-test-suite' package-directory: 'plugins/wp-graphql-buddypress' From 9d84152af7761dace5a3980232d357f8b3089452 Mon Sep 17 00:00:00 2001 From: Renato Alves <19148962+renatonascalves@users.noreply.github.com> Date: Sun, 5 May 2024 15:49:21 -0300 Subject: [PATCH 4/6] Last tweaks --- .github/workflows/deploy-to-wordpress.yml | 2 +- composer.json | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-to-wordpress.yml b/.github/workflows/deploy-to-wordpress.yml index 109f35a6..16b43b26 100644 --- a/.github/workflows/deploy-to-wordpress.yml +++ b/.github/workflows/deploy-to-wordpress.yml @@ -15,7 +15,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.0 + php-version: 8.2 extensions: mbstring, intl tools: composer:v2 coverage: none diff --git a/composer.json b/composer.json index 1751d152..05fb5df1 100644 --- a/composer.json +++ b/composer.json @@ -110,6 +110,8 @@ "*.cache", ".phpcs.xml", ".editorconfig", + "CHANGELOG.md", + "README.md", ".gitignore", ".distignore", ".deployignore", From 66d421ec7d9270ca255ab9faf642c6cb4fb7dcd6 Mon Sep 17 00:00:00 2001 From: Renato Alves <19148962+renatonascalves@users.noreply.github.com> Date: Mon, 6 May 2024 09:54:25 -0300 Subject: [PATCH 5/6] Remove object cache --- .github/workflows/unit-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 6e737a2e..0085e740 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -15,7 +15,6 @@ jobs: php: [8.0, 8.1, 8.2, 8.3] multisite: [true, false] wp_version: ['6.1', 'latest'] - object: ["memcached", "redis"] uses: alleyinteractive/.github/.github/workflows/php-tests.yml@feature/php-tests-core-suite with: multisite: ${{ matrix.multisite }} From 77751530069cc81c08b7e97dba8b9136271630e7 Mon Sep 17 00:00:00 2001 From: Renato Alves <19148962+renatonascalves@users.noreply.github.com> Date: Mon, 6 May 2024 10:17:05 -0300 Subject: [PATCH 6/6] Minor changes to the changelog --- CHANGELOG.md | 4 ++-- composer.json | 1 + readme.txt | 10 +++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7408f0cc..f75638ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.1.1] +## [0.1.1] 2024-05-06 ### Added @@ -15,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Updated -- chore: Upgrade to WPCS/VIPCS 3.0 (See https://github.com/alleyinteractive/alley-coding-standards) +- chore: Upgrade to WPCS/VIPCS 3.0 - chore: Supports WordPress 6.5. - ci: Updated Github Action Matrix to test more variations. - ci: Updated CI actions to support Node 20. diff --git a/composer.json b/composer.json index 05fb5df1..c081236d 100644 --- a/composer.json +++ b/composer.json @@ -109,6 +109,7 @@ "*.dist", "*.cache", ".phpcs.xml", + "composer.lock", ".editorconfig", "CHANGELOG.md", "README.md", diff --git a/readme.txt b/readme.txt index f19a0cb0..fcdfac22 100644 --- a/readme.txt +++ b/readme.txt @@ -34,18 +34,18 @@ Head over to the [BuddyPress Documentation](https://codex.buddypress.org/partici == Changelog == -= 0.1.1 = += 0.1.1 = 2024-05-06 **New Features** -- [#118](https://github.com/renatonascalves/wp-graphql-buddypress/issues/118): feat: Support BuddyPress Community Visibility, "Private Site". +- [#118](https://github.com/renatonascalves/wp-graphql-buddypress/issues/118): feat: Support BuddyPress Community Visibility: "Private Site". - [#127](https://github.com/renatonascalves/wp-graphql-buddypress/issues/127): feat: Add `resendSignupEmail` mutation to resend activation email -- [#115](https://github.com/renatonascalves/wp-graphql-buddypress/issues/115): chore: Add list of plugin dependencies -- chore: Added a `CHANGELOG.md` file **Chores / Bugfixes** -- chore: Upgrade to WPCS/VIPCS 3.0 (See https://github.com/alleyinteractive/alley-coding-standards) +- [#115](https://github.com/renatonascalves/wp-graphql-buddypress/issues/115): chore: Add list of plugin dependencies +- chore: Added a `CHANGELOG.md` file +- chore: Upgrade to WPCS/VIPCS 3.0 - chore: Supports WordPress 6.5. - ci: Updated Github Action Matrix to test more variations. - ci: Updated CI actions to support Node 20.