Skip to content

Commit

Permalink
Merge branch 'release/3.6.0' into update/marketplace-subnav
Browse files Browse the repository at this point in the history
* release/3.6.0:
  ecommerce module update to 1.3.9
  update tested version to upcoming 6.4
  NPM(deps): Bump @wordpress/dom-ready from 3.44.0 to 3.45.0
  Bump Onboarding to 1.11.8
  NPM Dev(deps-dev): Bump @wordpress/scripts from 26.15.0 to 26.16.0
  NPM(deps): Bump @wordpress/compose from 6.21.0 to 6.22.0
  NPM(deps): Bump @wordpress/i18n from 4.44.0 to 4.45.0
  NPM Dev(deps-dev): Bump @replayio/cypress from 1.6.1 to 1.6.2

# Conflicts:
#	composer.lock
  • Loading branch information
circlecube committed Nov 7, 2023
2 parents c40f7d2 + 990a52b commit b0999df
Show file tree
Hide file tree
Showing 6 changed files with 547 additions and 519 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/upload-asset-on-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@ jobs:
- name: NPM Install
run: npm install --legacy-peer-deps

- name: Validate WP Versions
if: ${{ (github.repository == 'bluehost/bluehost-wordpress-plugin') && (github.event.release.prerelease == false) }}
run: |
pluginHeaderTestedVersion=`grep "Tested up to:" bluehost-wordpress-plugin.php | grep -Eo "[0-9\.]*"`
wpEnvVersion=`grep "WordPress/WordPress#tags/" .wp-env.json | grep -Eo "[0-9\.]*"`
echo "Plugin header tested version: $pluginHeaderTestedVersion"
echo "wp-env version: $wpEnvVersion"
[[ "$wpEnvVersion" == "$pluginHeaderTestedVersion" ]] || exit 1
# - name: Validate WP Versions
# if: ${{ (github.repository == 'bluehost/bluehost-wordpress-plugin') && (github.event.release.prerelease == false) }}
# run: |
# pluginHeaderTestedVersion=`grep "Tested up to:" bluehost-wordpress-plugin.php | grep -Eo "[0-9\.]*"`
# wpEnvVersion=`grep "WordPress/WordPress#tags/" .wp-env.json | grep -Eo "[0-9\.]*"`
# echo "Plugin header tested version: $pluginHeaderTestedVersion"
# echo "wp-env version: $wpEnvVersion"
# [[ "$wpEnvVersion" == "$pluginHeaderTestedVersion" ]] || exit 1

- name: Build JavaScript
run: npm run build
Expand Down
2 changes: 1 addition & 1 deletion bluehost-wordpress-plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* Version: 3.6.0
* Requires at least: 6.0
* Requires PHP: 7.1
* Tested up to: 6.3.2
* Tested up to: 6.4.0
* Author: Bluehost
* Author URI: https://bluehost.com
* Text Domain: wp-plugin-bluehost
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@
"newfold-labs/wp-module-customer-bluehost": "^1.6.0",
"newfold-labs/wp-module-data": "^2.4.9",
"newfold-labs/wp-module-deactivation": "^1.0.2",
"newfold-labs/wp-module-ecommerce": "^1.3.5",
"newfold-labs/wp-module-ecommerce": "^1.3.9",
"newfold-labs/wp-module-global-ctb": "^1.0.9",
"newfold-labs/wp-module-help-center": "1.0.21",
"newfold-labs/wp-module-loader": "^1.0.10",
"newfold-labs/wp-module-marketplace": "^2.1.0",
"newfold-labs/wp-module-notifications": "^1.1.6",
"newfold-labs/wp-module-onboarding": "^1.11.7",
"newfold-labs/wp-module-onboarding": "^1.11.8",
"newfold-labs/wp-module-patterns": "^0.1.8",
"newfold-labs/wp-module-performance": "^1.2.2",
"newfold-labs/wp-module-runtime": "^1.0.7",
Expand Down
26 changes: 13 additions & 13 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b0999df

Please sign in to comment.