Merge branch 'master' into fix-masonry-lightbox

.github/workflows/test-e2e.yml

@@ -6,8 +6,18 @@ on:
       - master
 
 jobs:
+  # Requires re-working our helpers to be backward compat.
+  # chrome_e2e_major_before_previous_major:
+  #   name: Chrome with major before previous major WP version
+  #   uses: ./.github/workflows/test-e2e-cypress.yml
+  #   with:
+  #     wpVersion: "WordPress/WordPress#6.1"
+  #   concurrency:
+  #     group: chrome-defaults-major-before-previous-major
+  #     cancel-in-progress: true
+
   chrome_e2e_previous_major:
-    name: Chrome with previous major WP version.
+    name: Chrome with previous major WP version
     uses: ./.github/workflows/test-e2e-cypress.yml
     with:
       wpVersion: "WordPress/WordPress#6.2"

.github/workflows/test-php-unit.yml

@@ -7,6 +7,10 @@ on:
         required: false
         type: string
         default: '8.1'
+      wpVersion:
+        required: false
+        type: string
+        default: ''
 
 jobs:
   php_unit:
@@ -34,6 +38,7 @@ jobs:
       - name: Setup wp-env
         uses: godaddy-wordpress/setup-wp-env@v1
         with:
+          core: ${{ inputs.wpVersion }}
           phpVersion: ${{ inputs.phpVersion }}
           plugins: '[".","https://downloads.wordpress.org/plugin/woocommerce.zip"]'
           themes: '["https://downloads.wordpress.org/theme/go.zip"]'

.github/workflows/test-php.yml

@@ -7,25 +7,43 @@ on:
 
 jobs:
   php_unit_74:
-    name: PHP 7.4
+    name: PHP 7.4 Current Major
     uses: ./.github/workflows/test-php-unit.yml
     with:
       phpVersion: '7.4'
+      wpVersion: 'WordPress/WordPress#6.3'
 
   php_unit_80:
-    name: PHP 8.0
+    name: PHP 8.0 Current Major
     uses: ./.github/workflows/test-php-unit.yml
     with:
       phpVersion: '8.0'
+      wpVersion: 'WordPress/WordPress#6.3'
 
   php_unit_81:
-    name: PHP 8.1
+    name: PHP 8.1 Current Major
     uses: ./.github/workflows/test-php-unit.yml
     with:
       phpVersion: '8.1'
-
+      wpVersion: 'WordPress/WordPress#6.3'
+
   php_unit_82:
-    name: PHP 8.2
+    name: PHP 8.2 Current Major
+    uses: ./.github/workflows/test-php-unit.yml
+    with:
+      phpVersion: '8.2'
+      wpVersion: 'WordPress/WordPress#6.3'
+
+  php_unit_82_wp_last_major:
+    name: PHP 8.2 Last Major
+    uses: ./.github/workflows/test-php-unit.yml
+    with:
+      phpVersion: '8.2'
+      wpVersion: 'WordPress/WordPress#6.2'
+
+  php_unit_82_wp_major_before_last_major:
+    name: PHP 8.2 Major Before Last Major
     uses: ./.github/workflows/test-php-unit.yml
     with:
       phpVersion: '8.2'
+      wpVersion: 'WordPress/WordPress#6.1'

class-coblocks.php

@@ -8,7 +8,7 @@
  * Text Domain: coblocks
  * Domain Path: /languages
  * Tested up to: 6.3
- * Requires at least: 6.2
+ * Requires at least: 6.1
  *
  * CoBlocks is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

gruntfile.js

@@ -80,6 +80,10 @@ module.exports = function( grunt ) {
 						from: /Tested up to:(\s*?)[a-zA-Z0-9\.\-\+]+$/m,
 						to: 'Tested up to:$1' + pkg.tested_up_to,
 					},
+					{
+						from: /Requires at least:(\s*?)[a-zA-Z0-9\.\-\+]+$/m,
+						to: 'Requires at least:$1' + pkg.requires_at_least,
+					},
 				],
 			},
 			readme: {
@@ -94,6 +98,10 @@ module.exports = function( grunt ) {
 						from: /Tested up to:(\s*?)[a-zA-Z0-9\.\-\+]+$/m,
 						to: 'Tested up to:$1' + pkg.tested_up_to,
 					},
+					{
+						from: /Requires at least:(\s*?)[a-zA-Z0-9\.\-\+]+$/m,
+						to: 'Requires at least:$1' + pkg.requires_at_least,
+					},
 				],
 			},
 			tests: {

package.json

@@ -4,6 +4,7 @@
 	"description": "CoBlocks is a suite of professional page building blocks for the WordPress Gutenberg block editor.",
 	"version": "3.1.2",
 	"tested_up_to": "6.3",
+	"requires_at_least": "6.1",
 	"author": "GoDaddy",
 	"license": "GPL-2.0",
 	"repository": "godaddy-wordpress/coblocks",

readme.txt

@@ -2,7 +2,7 @@
 Author URI: https://www.godaddy.com
 Contributors: godaddy, richtabor, eherman24, jonathanbardo, jrtashjian, paranoia1906, fjarrett, olivierlafleur, jasonlemay, snovosel
 Tags: page builder, Gutenberg blocks, WordPress blocks, gutenberg, blocks
-Requires at least: 6.2
+Requires at least: 6.1
 Tested up to: 6.3
 Requires PHP: 7.4
 Stable tag: 3.1.2

src/blocks/events/test/events.cypress.js

@@ -5,13 +5,13 @@ import * as helpers from '../../../../.dev/tests/cypress/helpers';
 
 describe( 'Block: Events', function() {
 	// Setup events data.
-	const eventsData = {
-		color: {
-			textColor: '#ffffff',
-			textColorRGB: 'rgb(255, 255, 255)',
-		},
-		ical: 'https://calendar.google.com/calendar/ical/8hohgb8qv19fgvjbbkcehe0ce0%40group.calendar.google.com/public/basic.ics',
-	};
+	// const eventsData = {
+	// 	color: {
+	// 		textColor: '#ffffff',
+	// 		textColorRGB: 'rgb(255, 255, 255)',
+	// 	},
+	// 	ical: 'https://calendar.google.com/calendar/ical/8hohgb8qv19fgvjbbkcehe0ce0%40group.calendar.google.com/public/basic.ics',
+	// };
 
 	beforeEach( () => {
 		helpers.addBlockToPost( 'coblocks/events', true );