Merge pull request #425 from bluehost/fix/matrix-workflow

Fix/matrix workflow
bluehost · May 10, 2023 · 0dc4154 · 0dc4154
2 parents ec21663 + b5ff3c1
commit 0dc4154
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.github/workflows/cypress-matrix.yml b/.github/workflows/cypress-matrix.yml
@@ -2,7 +2,7 @@ name: Cypress Test Matrix
 
 on:
   pull_request:
-    types: [ opened, edited, reopened, ready_for_review ]
+    types: [ opened, edited, reopened, ready_for_review, synchronize ]
     branches:
       - 'master'
   workflow_dispatch:

diff --git a/cypress.config.js b/cypress.config.js
@@ -47,6 +47,7 @@ module.exports = defineConfig({
 				}
 			}
 
+			// Exclude onboarding tests for WordPress lower than 6.1
 			if (semver.satisfies(config.env.wpSemverVersion, '<6.1.0')) {
 				config.excludeSpecPattern = config.excludeSpecPattern.concat(
 					[
@@ -56,6 +57,15 @@ module.exports = defineConfig({
 				);
 			}
 
+			// Exclude onboarding/ecommerce tests for PHP lower than 7.3 (7.1 and 7.2)
+			if (semver.satisfies(config.env.phpVersion, '<7.3.0')) {
+				config.excludeSpecPattern = config.excludeSpecPattern.concat(
+					[
+						"tests/cypress/integration/z-newfold-labs/wp-module-onboarding/ecommerce/**",
+					]
+				);
+			}
+
 			return config;
 		},
 		baseUrl: 'http://localhost:8882',