From 2a4afdfec93dba05d3cbbf2b8bdb571fb270e059 Mon Sep 17 00:00:00 2001 From: Hardeep Asrani Date: Mon, 14 Oct 2024 19:01:39 +0530 Subject: [PATCH 1/3] chore: update condition for Hyve promo --- views/settings.php | 3 ++- views/wizard.php | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/views/settings.php b/views/settings.php index b6cfd3d..6c53766 100644 --- a/views/settings.php +++ b/views/settings.php @@ -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" - +

diff --git a/views/wizard.php b/views/wizard.php index a51dd5f..f616e40 100644 --- a/views/wizard.php +++ b/views/wizard.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' ); + ?>
@@ -86,7 +88,7 @@
- +
From b50ad57e909d04322adca168fdd54db18c99d79a Mon Sep 17 00:00:00 2001 From: Hardeep Asrani Date: Mon, 14 Oct 2024 19:17:09 +0530 Subject: [PATCH 2/3] chore: update themeisle-sdk --- composer.lock | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index c5a24b9..d3c8e02 100644 --- a/composer.lock +++ b/composer.lock @@ -8,20 +8,21 @@ "packages": [ { "name": "codeinwp/themeisle-sdk", - "version": "3.3.30", + "version": "3.3.31", "source": { "type": "git", "url": "https://github.com/Codeinwp/themeisle-sdk.git", - "reference": "801a07604a297f02de3067948176f91b4c84bd8a" + "reference": "cc8da0623a1814d168baf7194eda1cba354bdc38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeinwp/themeisle-sdk/zipball/801a07604a297f02de3067948176f91b4c84bd8a", - "reference": "801a07604a297f02de3067948176f91b4c84bd8a", + "url": "https://api.github.com/repos/Codeinwp/themeisle-sdk/zipball/cc8da0623a1814d168baf7194eda1cba354bdc38", + "reference": "cc8da0623a1814d168baf7194eda1cba354bdc38", "shasum": "" }, "require-dev": { - "codeinwp/phpcs-ruleset": "dev-main" + "codeinwp/phpcs-ruleset": "dev-main", + "yoast/phpunit-polyfills": "^2.0" }, "type": "library", "notification-url": "https://packagist.org/downloads/", @@ -40,7 +41,11 @@ "keywords": [ "wordpress" ], - "time": "2024-09-10T23:53:07+00:00" + "support": { + "issues": "https://github.com/Codeinwp/themeisle-sdk/issues", + "source": "https://github.com/Codeinwp/themeisle-sdk/tree/v3.3.31" + }, + "time": "2024-10-14T13:13:47+00:00" } ], "packages-dev": [ @@ -609,5 +614,5 @@ "platform-overrides": { "php": "5.6" }, - "plugin-api-version": "1.1.0" + "plugin-api-version": "2.6.0" } From 72d23e673cbf867d08b2f54c36dc91a557b3e5c1 Mon Sep 17 00:00:00 2001 From: Hardeep Asrani Date: Mon, 14 Oct 2024 19:28:10 +0530 Subject: [PATCH 3/3] fix: gh actions failing --- .github/workflows/build-dev-artifact.yml | 7 +++++++ .github/workflows/deploy.yml | 7 +++++++ .github/workflows/test-php.yml | 2 ++ 3 files changed, 16 insertions(+) diff --git a/.github/workflows/build-dev-artifact.yml b/.github/workflows/build-dev-artifact.yml index 2327327..455c2bb 100644 --- a/.github/workflows/build-dev-artifact.yml +++ b/.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)" diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d4edc66..39e9277 100644 --- a/.github/workflows/deploy.yml +++ b/.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 diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml index bc15b33..ad28a37 100644 --- a/.github/workflows/test-php.yml +++ b/.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'] }}