Release 2.4.4 (#578)

* Update CONTRIBUTING.md (#554) * [CMS-1033] Fix GH action (#556) * Ignore CHANGELOG.md (#560) * Make dependabot target develop branch (#561) * [BUGS-5309] Fix WordPress.org readme (#562) * [CMS-1033] Release 2.4.0 (#557) * Bump minimatch from 3.0.4 to 3.0.8 (#552) Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.0.8. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Commits](isaacs/minimatch@v3.0.4...v3.0.8) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump grunt-contrib-jshint from 3.1.1 to 3.2.0 (#515) Bumps [grunt-contrib-jshint](https://github.com/gruntjs/grunt-contrib-jshint) from 3.1.1 to 3.2.0. - [Release notes](https://github.com/gruntjs/grunt-contrib-jshint/releases) - [Changelog](https://github.com/gruntjs/grunt-contrib-jshint/blob/main/CHANGELOG) - [Commits](gruntjs/grunt-contrib-jshint@v3.1.1...v3.2.0) --- updated-dependencies: - dependency-name: grunt-contrib-jshint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump grunt-contrib-uglify from 5.2.1 to 5.2.2 (#536) Bumps [grunt-contrib-uglify](https://github.com/gruntjs/grunt-contrib-uglify) from 5.2.1 to 5.2.2. - [Release notes](https://github.com/gruntjs/grunt-contrib-uglify/releases) - [Changelog](https://github.com/gruntjs/grunt-contrib-uglify/blob/main/CHANGELOG) - [Commits](gruntjs/grunt-contrib-uglify@v5.2.1...v5.2.2) --- updated-dependencies: - dependency-name: grunt-contrib-uglify dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump node-sass from 7.0.3 to 8.0.0 (#550) Bumps [node-sass](https://github.com/sass/node-sass) from 7.0.3 to 8.0.0. - [Release notes](https://github.com/sass/node-sass/releases) - [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md) - [Commits](sass/node-sass@v7.0.3...v8.0.0) --- updated-dependencies: - dependency-name: node-sass dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix code blocks * add changelog * bump version to 2.4.1 * add changelog for THIS release Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: John Spellman <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * bump changelogs * bump versions * add PR link * add the numbers to the links * Bump qs from 6.5.2 to 6.11.0 (#565) * Release 2.4.2 (#564) * Update CONTRIBUTING.md (#554) * [CMS-1033] Fix GH action (#556) * Ignore CHANGELOG.md (#560) * Make dependabot target develop branch (#561) * [BUGS-5309] Fix WordPress.org readme (#562) * [CMS-1033] Release 2.4.0 (#557) * Bump minimatch from 3.0.4 to 3.0.8 (#552) Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.0.8. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Commits](isaacs/minimatch@v3.0.4...v3.0.8) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump grunt-contrib-jshint from 3.1.1 to 3.2.0 (#515) Bumps [grunt-contrib-jshint](https://github.com/gruntjs/grunt-contrib-jshint) from 3.1.1 to 3.2.0. - [Release notes](https://github.com/gruntjs/grunt-contrib-jshint/releases) - [Changelog](https://github.com/gruntjs/grunt-contrib-jshint/blob/main/CHANGELOG) - [Commits](gruntjs/grunt-contrib-jshint@v3.1.1...v3.2.0) --- updated-dependencies: - dependency-name: grunt-contrib-jshint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump grunt-contrib-uglify from 5.2.1 to 5.2.2 (#536) Bumps [grunt-contrib-uglify](https://github.com/gruntjs/grunt-contrib-uglify) from 5.2.1 to 5.2.2. - [Release notes](https://github.com/gruntjs/grunt-contrib-uglify/releases) - [Changelog](https://github.com/gruntjs/grunt-contrib-uglify/blob/main/CHANGELOG) - [Commits](gruntjs/grunt-contrib-uglify@v5.2.1...v5.2.2) --- updated-dependencies: - dependency-name: grunt-contrib-uglify dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump node-sass from 7.0.3 to 8.0.0 (#550) Bumps [node-sass](https://github.com/sass/node-sass) from 7.0.3 to 8.0.0. - [Release notes](https://github.com/sass/node-sass/releases) - [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md) - [Commits](sass/node-sass@v7.0.3...v8.0.0) --- updated-dependencies: - dependency-name: node-sass dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix code blocks * add changelog * bump version to 2.4.1 * add changelog for THIS release Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: John Spellman <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * bump changelogs * bump versions * add PR link * add the numbers to the links Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: John Spellman <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump qs from 6.5.2 to 6.11.0 Bumps [qs](https://github.com/ljharb/qs) from 6.5.2 to 6.11.0. - [Release notes](https://github.com/ljharb/qs/releases) - [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md) - [Commits](ljharb/qs@v6.5.2...v6.11.0) --- updated-dependencies: - dependency-name: qs dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Chris Reynolds <[email protected]> Co-authored-by: John Spellman <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Include schema.xml in release distribution (#568) * Bump dealerdirect/phpcodesniffer-composer-installer from 0.7.2 to 1.0.0 (#570) Bumps [dealerdirect/phpcodesniffer-composer-installer](https://github.com/Dealerdirect/phpcodesniffer-composer-installer) from 0.7.2 to 1.0.0. - [Release notes](https://github.com/Dealerdirect/phpcodesniffer-composer-installer/releases) - [Changelog](https://github.com/PHPCSStandards/composer-installer/blob/main/.github_changelog_generator) - [Commits](PHPCSStandards/composer-installer@v0.7.2...v1.0.0) --- updated-dependencies: - dependency-name: dealerdirect/phpcodesniffer-composer-installer dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [CMSP-93] Migrate to GitHub actions (#571) * Clean up debug code (#572) * Bump grunt from 1.5.3 to 1.6.1 (#573) * Bump http-cache-semantics from 4.1.0 to 4.1.1 (#574) * Fix failing tests (#577) * remove add pubkeys step * fully remove add pubkeys step not actually required for the PHP Unit tests. * Bump yoast/phpunit-polyfills from 1.0.4 to 1.0.5 (#576) Bumps [yoast/phpunit-polyfills](https://github.com/Yoast/PHPUnit-Polyfills) from 1.0.4 to 1.0.5. - [Release notes](https://github.com/Yoast/PHPUnit-Polyfills/releases) - [Changelog](https://github.com/Yoast/PHPUnit-Polyfills/blob/2.x/CHANGELOG.md) - [Commits](Yoast/PHPUnit-Polyfills@1.0.4...1.0.5) --- updated-dependencies: - dependency-name: yoast/phpunit-polyfills dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * update circle status badge and remove travis badge * bump versions and tested up to * add john to contributors list * update changelog * bump date to tomorrow won't release this today --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: John Spellman <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
pantheon-systems · Apr 7, 2023 · d353821 · d353821
1 parent f133c3e
commit d353821
Show file tree

Hide file tree

Showing 12 changed files with 5,050 additions and 654 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
@@ -0,0 +1,141 @@
+name: Lint and Test
+on:
+  push:
+    branches:
+      - '**'
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    container:
+      image: quay.io/pantheon-public/build-tools-ci:8.x-php7.4
+      options: --user root
+    name: Lint
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Cache dependencies
+      uses: actions/cache@v3
+      with:
+        path: ~/vendor
+        key: test-lint-dependencies-{{ checksum "composer.json" }}
+        restore-keys: test-lint-dependencies-{{ checksum "composer.json" }}
+
+    - name: Install dependencies
+      run: composer install -n --prefer-dist
+
+    - name: Run PHP Lint
+      run: composer phpcs
+
+  test-phpunit:
+    needs: lint
+    runs-on: ubuntu-latest
+    services:
+      mariadb:
+        image: mariadb:10.3
+    name: PHP Unit tests
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Start MySQL
+      run: |
+        sudo systemctl start mysql
+
+    - name: Cache dependencies
+      uses: actions/cache@v3
+      with:
+        path: ~/vendor
+        key: test-phpunit-dependencies-{{ checksum "composer.json" }}
+        restore-keys: test-phpunit-dependencies-{{ checksum "composer.json" }}
+
+    - name: Install Extras
+      run: |
+        sudo apt-get update
+        sudo apt-get install subversion
+
+    - name: Run install-solr.sh
+      run: bash bin/install-solr.sh
+
+    - name: Set PHP version
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '8.0'
+        coverage: none
+
+    - name: Install dependencies
+      run: composer install
+
+    - name: "Run Tests"
+      run: |
+        bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1 latest
+        composer phpunit
+        rm -rf $WP_TESTS_DIR $WP_CORE_DIR
+        bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1 nightly true
+        WP_MULTISITE=1 composer phpunit
+
+  test-behat:
+    needs: test-phpunit
+    runs-on: ubuntu-latest
+    container:
+      image: quay.io/pantheon-public/build-tools-ci:8.x-php7.4
+      options: --user root
+    env:
+      TERMINUS_TOKEN: ${{ secrets.TERMINUS_TOKEN }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      TERMINUS_ENV: ci-${{github.run_number}}
+      TERMINUS_SITE: solr-power
+      SITE_ENV: solr-power.ci-${{github.run_number}}
+      WORDPRESS_ADMIN_USERNAME: pantheon
+      WORDPRESS_ADMIN_EMAIL: [email protected]
+      WORDPRESS_ADMIN_PASSWORD: solr-power.ci-${{github.run_number}}
+    name: Behat tests
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Install SSH key
+      uses: webfactory/[email protected]
+      with:
+        ssh-private-key: ${{ secrets.SITE_OWNER_SSH_PRIVATE_KEY }}
+
+    - name: Cache dependencies
+      uses: actions/cache@v3
+      with:
+        path: ~/vendor
+        key: test-behat-dependencies-{{ checksum "composer.json" }}
+        restore-keys: test-behat-dependencies-{{ checksum "composer.json" }}
+
+    - name: Check for $GITHUB_TOKEN
+      run: |
+        if [ -z "$GITHUB_TOKEN" ]; then
+          echo "GITHUB_TOKEN environment variables missing; assuming unauthenticated build"
+          exit 0
+        fi
+        echo "Setting GitHub OAuth token with suppressed ouput"
+        {
+          composer config -g github-oauth.github.com $GITHUB_TOKEN
+        } &> /dev/null
+
+    - name: Check for $TERMINUS_TOKEN
+      run: |
+        if [ -z "$TERMINUS_TOKEN" ]; then
+          echo "TERMINUS_TOKEN environment variables missing; assuming unauthenticated build"
+          exit 0
+        fi
+        terminus auth:login --machine-token=$TERMINUS_TOKEN
+
+    - name: Prepare for Behat tests
+      run: ./bin/behat-prepare.sh
+
+    - name: Execute Behat tests
+      run: ./bin/behat-test.sh --strict
+
+    - name: Clean up Behat tests
+      run: ./bin/behat-cleanup.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 ## Changelog ##
+## 2.4.4 (April 7, 2023) ##
+* Update Composer dependencies [[#576](https://github.com/pantheon-systems/solr-power/pull/576)] [[#574](https://github.com/pantheon-systems/solr-power/pull/574)] [[#573](https://github.com/pantheon-systems/solr-power/pull/573)]
+* Fix failing tests [[#577](https://github.com/pantheon-systems/solr-power/pull/577)]
+* Update tested up to version
 
 ## 2.4.3 (January 19, 2022) ##
 * Include schema.xml in release distribution [[#568](https://github.com/pantheon-systems/solr-power/pull/568)]

diff --git a/README.md b/README.md
@@ -1,20 +1,19 @@
 # Solr Search for WordPress #
-**Contributors:** [getpantheon](https://profiles.wordpress.org/getpantheon), [Outlandish Josh](https://profiles.wordpress.org/outlandish-josh), [10up](https://profiles.wordpress.org/10up), [collinsinternet](https://profiles.wordpress.org/collinsinternet), [andrew.taylor](https://profiles.wordpress.org/andrew.taylor), [danielbachhuber](https://profiles.wordpress.org/danielbachhuber), [mattleff](https://profiles.wordpress.org/mattleff), [mikengarrett](https://profiles.wordpress.org/mikengarrett), [jazzsequence](https://profiles.wordpress.org/jazzs3quence)
-**Tags:** search
-**Requires at least:** 4.6
-**Requires PHP:** 7.1
-**Tested up to:** 6.0
-**Stable tag:** 2.4.3
-**License:** GPLv2 or later
+**Contributors:** [getpantheon](https://profiles.wordpress.org/getpantheon), [Outlandish Josh](https://profiles.wordpress.org/outlandish-josh), [10up](https://profiles.wordpress.org/10up), [collinsinternet](https://profiles.wordpress.org/collinsinternet), [andrew.taylor](https://profiles.wordpress.org/andrew.taylor), [danielbachhuber](https://profiles.wordpress.org/danielbachhuber), [mattleff](https://profiles.wordpress.org/mattleff), [mikengarrett](https://profiles.wordpress.org/mikengarrett), [jazzsequence](https://profiles.wordpress.org/jazzs3quence), [jspellman](https://profiles.wordpress.org/jspellman/)  
+**Tags:** search  
+**Requires at least:** 4.6  
+**Requires PHP:** 7.1  
+**Tested up to:** 6.2  
+**Stable tag:** 2.4.4  
+**License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html
 
 Improve your user experience with the Apache Solr search engine for your WordPress website.
 
 ## Description ##
 
 [![Actively Maintained](https://img.shields.io/badge/Pantheon-Actively_Maintained-yellow?logo=pantheon&color=FFDC28)](https://pantheon.io/docs/oss-support-levels#actively-maintained-support)
-[![Travis Build Status](https://travis-ci.org/pantheon-systems/solr-power.svg?branch=master)](https://travis-ci.org/pantheon-systems/solr-power)
-[![Circle CI Build Status](https://circleci.com/gh/pantheon-systems/solr-power.svg?style=shield&circle-token=3af522a81a29eab25828a6b0d52e2f1afa7f044b)](https://circleci.com/gh/pantheon-systems/solr-power)
+[![CircleCI](https://dl.circleci.com/status-badge/img/gh/pantheon-systems/solr-power/tree/main.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/pantheon-systems/solr-power/tree/main)
 
 Search is critical for your site, but the default search for WordPress leaves a lot to be desired. Improve your user experience with the Apache Solr search engine for your WordPress website.
 

diff --git a/bin/behat-prepare.sh b/bin/behat-prepare.sh
@@ -24,6 +24,9 @@ fi
 
 set -ex
 
+# Set StrictHostKeyChecking to no
+echo "StrictHostKeyChecking no" >> /etc/ssh/ssh_config
+
 ###
 # Create a new environment for this particular test run.
 ###
@@ -51,7 +54,20 @@ git clone -b $TERMINUS_ENV $PANTHEON_GIT_URL $PREPARE_DIR
 rm -rf $PREPARE_DIR/wp-content/plugins/solr-power
 cd $BASH_DIR/..
 rsync -av --exclude='node_modules/' --exclude='tests/' ./* $PREPARE_DIR/wp-content/plugins/solr-power
+cd $PREPARE_DIR/wp-content/plugins/solr-power
+
+###
+# Build plugin
+###
+npm ci
+npm run build
+composer install --no-dev -o
+
+# Remove unneeded stuff
 rm -rf $PREPARE_DIR/wp-content/plugins/solr-power/.git
+rm -rf $PREPARE_DIR/wp-content/plugins/solr-power/node_modules/
+rm -rf $PREPARE_DIR/wp-content/plugins/solr-power/tests/
+cd $BASH_DIR/..
 
 # Download the latest Classic Editor release from WordPress.org
 wget -O $PREPARE_DIR/classic-editor.zip https://downloads.wordpress.org/plugin/classic-editor.zip
@@ -75,9 +91,7 @@ terminus build:workflow:wait $TERMINUS_SITE.$TERMINUS_ENV
 ###
 # Set up WordPress, theme, and plugins for the test run
 ###
-{
-  terminus wp $SITE_ENV -- core install --title=$TERMINUS_ENV-$TERMINUS_SITE --url=$PANTHEON_SITE_URL --admin_user=$WORDPRESS_ADMIN_USERNAME --admin_email=$WORDPRESS_ADMIN_EMAIL --admin_password=$WORDPRESS_ADMIN_PASSWORD
-} &> /dev/null
+terminus wp $SITE_ENV -- core install --title=$TERMINUS_ENV-$TERMINUS_SITE --url=$PANTHEON_SITE_URL --admin_user=$WORDPRESS_ADMIN_USERNAME --admin_email=$WORDPRESS_ADMIN_EMAIL --admin_password=$WORDPRESS_ADMIN_PASSWORD
 terminus wp $SITE_ENV -- plugin activate solr-power classic-editor
 terminus wp $SITE_ENV -- theme activate twentyseventeen
 terminus wp $SITE_ENV -- rewrite structure '/%year%/%monthnum%/%day%/%postname%/'
diff --git a/bin/behat-test.sh b/bin/behat-test.sh
@@ -24,4 +24,8 @@ set -ex
 
 export BEHAT_PARAMS='{"extensions" : {"Behat\\MinkExtension" : {"base_url" : "http://'$TERMINUS_ENV'-'$TERMINUS_SITE'.pantheonsite.io"} }}'
 
+###
+# Install dependencies for tests
+###
+composer install
 ./vendor/bin/behat "$@"
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
     "require-dev": {
         "pantheon-systems/pantheon-wordpress-upstream-tests": "dev-master",
         "wp-coding-standards/wpcs": "^2.1",
-        "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+        "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
         "phpunit/phpunit": "^6 || ^7",
         "phpcompatibility/php-compatibility": "^9.3",
         "yoast/phpunit-polyfills": "^1.0"