Skip to content

Commit

Permalink
Merge branch 'develop' into update/ecommerce-module
Browse files Browse the repository at this point in the history
* develop:
  Composer(deps): Bump newfold-labs/wp-module-coming-soon
  validate composer lock file
  Composer(deps): Bump newfold-labs/wp-module-deactivation
  Add node dependency from the performance module
  Bump Performance to 2.1.0
  ecommerce and help center version bumps
  Update description to mention PR due date is a week before
  NPM(deps): Bump @wordpress/icons from 10.13.0 to 10.14.0
  NPM(deps): Bump @wordpress/element from 6.13.0 to 6.14.0
  run npm audit fix
  npm run set-version-bump - Version updated 3.15.7 => 3.15.8

# Conflicts:
#	composer.json
#	composer.lock
#	package-lock.json
#	package.json
  • Loading branch information
circlecube committed Dec 18, 2024
2 parents b10161a + d46b6f9 commit 87637c4
Show file tree
Hide file tree
Showing 7 changed files with 755 additions and 1,283 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/create-milestones.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ jobs:
# Set the date format for the milestone title and due date
DATE=$(date -u -d "$DUE_DATE" '+%B %-d, %Y') # Human-readable date
PR_DEADLINE=$(date -u -d "$DUE_DATE - 1 week" '+%B %-d, %Y') # Date 1 week before
DATE_ISO8601=$(date -u -d "$DUE_DATE" '+%Y-%m-%dT23:59:59Z') # ISO8601 format
# Prepare the description for the milestone
DESCRIPTION="The release is scheduled for $DATE, and PRs should be submitted and made mergeable by EOD $DATE. This means they should have tests passing and merge conflicts resolved. The description for the PR must include details of what is included in the PR and how to test it, and preferably new tests supporting the update.\n\nAny PRs submitted after the deadline will not be included in the release but go in the next release. This includes PRs with tests failing, no description, no screenshots/video demonstrating the update, sufficient Cypress tests, no link to associated JIRA ticket, etc. If no mergeable PRs are submitted for a release, there will be no release that week (unless there is a need for an out-of-cycle release)."
DESCRIPTION="The release is scheduled for $DATE. PRs must be submitted and made mergeable by EOD $PR_DEADLINE (one week before release). This means they should have tests passing and merge conflicts resolved. The description for the PR must include details of what is included in the PR and how to test it, and preferably new tests supporting the update.\n\nAny PRs submitted after the deadline will not be included in the release but go in the next release. This includes PRs with tests failing, no description, no screenshots/video demonstrating the update, sufficient Cypress tests, no link to associated JIRA ticket, etc. If no mergeable PRs are submitted for a release, there will be no release that week (unless there is a need for an out-of-cycle release)."
# Debugging outputs
echo "Debug: Human-readable Date: $DATE"
Expand Down
4 changes: 2 additions & 2 deletions bluehost-wordpress-plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* Plugin URI: https://bluehost.com
* Update URI: https://github.com/bluehost/bluehost-wordpress-plugin
* Description: WordPress plugin that integrates a WordPress site with the Bluehost control panel, including performance, security, and update features.
* Version: 3.15.7
* Version: 3.15.8
* Requires at least: 6.5
* Requires PHP: 7.3
* Tested up to: 6.7.1
Expand All @@ -32,7 +32,7 @@
}

// Define constants
define( 'BLUEHOST_PLUGIN_VERSION', '3.15.7' );
define( 'BLUEHOST_PLUGIN_VERSION', '3.15.8' );
define( 'BLUEHOST_PLUGIN_FILE', __FILE__ );
define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@
"require": {
"newfold-labs/wp-module-activation": "^1.0.5",
"newfold-labs/wp-module-atomic": "^1.3.0",
"newfold-labs/wp-module-coming-soon": "^1.3.2",
"newfold-labs/wp-module-coming-soon": "^1.3.3",
"newfold-labs/wp-module-context": "^1.0.1",
"newfold-labs/wp-module-data": "^2.6.8",
"newfold-labs/wp-module-deactivation": "^1.2.3",
"newfold-labs/wp-module-ecommerce": "^1.4.5",
"newfold-labs/wp-module-deactivation": "^1.3.0",
"newfold-labs/wp-module-ecommerce": "^1.4.6",
"newfold-labs/wp-module-facebook": "^1.0.9",
"newfold-labs/wp-module-features": "^1.4.2",
"newfold-labs/wp-module-global-ctb": "^1.0.13",
"newfold-labs/wp-module-help-center": "^2.2.1",
"newfold-labs/wp-module-help-center": "^2.2.3",
"newfold-labs/wp-module-installer": "^1.2.2",
"newfold-labs/wp-module-loader": "^1.0.11",
"newfold-labs/wp-module-marketplace": "^2.4.0",
Expand All @@ -91,7 +91,7 @@
"newfold-labs/wp-module-onboarding": "^2.5.5",
"newfold-labs/wp-module-onboarding-data": "^1.2.4",
"newfold-labs/wp-module-patterns": "^2.8.1",
"newfold-labs/wp-module-performance": "^2.0.1",
"newfold-labs/wp-module-performance": "^2.1.0",
"newfold-labs/wp-module-pls": "^1.0.0",
"newfold-labs/wp-module-runtime": "^1.0.12",
"newfold-labs/wp-module-secure-passwords": "^1.1.1",
Expand Down
Loading

0 comments on commit 87637c4

Please sign in to comment.