release: 2.6.13

- Codebase updates.

Author: HardeepAsrani

.github/workflows/build-dev-artifact.yml

@@ -13,12 +13,19 @@ jobs:
     name: Build ZIP and upload to s3
     if: github.event.pull_request.draft == false && github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [14.x]
     outputs:
       branch-name: ${{ steps.retrieve-branch-name.outputs.branch_name }}
       git-sha-8: ${{ steps.retrieve-git-sha-8.outputs.sha8 }}
     steps:
       - name: Check out source files
         uses: actions/checkout@v2
+      - name: Build files using ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"

.github/workflows/deploy.yml

@@ -8,8 +8,15 @@ jobs:
   tag:
     name: New version
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [14.x]
     steps:
       - uses: actions/checkout@master
+      - name: Build files using ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
       - name: Build
         run: |
           yarn install --frozen-lockfile

.github/workflows/test-php.yml

@@ -56,6 +56,8 @@ jobs:
           tools: phpunit-polyfills
       - name: Checkout source code
         uses: actions/checkout@v2
+      - name: Install Subversion
+        run: sudo apt-get update && sudo apt-get install -y subversion
       - name: Install WordPress Test Suite
         run: |
           bash bin/install-wp-tests.sh wordpress_test root root 127.0.0.1:${{ job.services.mysql.ports['3306'] }}

composer.lock

@@ -14,6 +14,7 @@
 
 $is_otter_active   = is_plugin_active( 'otter-blocks/otter-blocks.php' ) || defined( 'OTTER_BLOCKS_VERSION' );
 $is_hyve_installed = file_exists( ABSPATH . 'wp-content/plugins/hyve-lite/hyve-lite.php' ) || defined( 'HYVE_LITE_VERSION' );
+$is_min_php_8_1    = version_compare( PHP_VERSION, '8.1', '>=' );
 
 $hyve_url = add_query_arg(
 	array(
@@ -830,7 +831,7 @@ class="button image_uploader_trigger"
 							<tbody>
 								<tr valign="top">
 									<td colspan="2">
-										<?php if ( ! $is_hyve_installed ) : ?>
+										<?php if ( ! $is_hyve_installed && $is_min_php_8_1 ) : ?>
 											<div class="wpmm-notice">
 												<div class="wpmm-notice-content">
 													<h3><?php esc_html_e( 'Enhance Your WordPress Site with Hyve AI Chatbot', 'wp-maintenance-mode' ); ?></h3>

views/settings.php

@@ -14,6 +14,8 @@
 	),
 );
 
+$show_hyve_promo = version_compare( PHP_VERSION, '8.1', '>=' ) && ! is_plugin_active( 'hyve-lite/hyve-lite.php' ) && ! defined( 'HYVE_LITE_VERSION' );
+
 ?>
 <div id="wpmm-wizard-wrapper">
 	<div class="slider-wrap">
@@ -86,7 +88,7 @@
 					</div>
 				<?php } ?>
 
-				<?php if ( ! is_plugin_active( 'hyve-lite/hyve-lite.php' ) || ! defined( 'HYVE_LITE_VERSION' ) ) { ?>
+				<?php if ( $show_hyve_promo ) { ?>
 					<div class="optimole-upsell">
 						<div class="optimole-upsell-container">
 							<span class="components-checkbox-control__input-container">