Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/2.12.4 #841

Merged
merged 29 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
1d05770
Composer(deps): Bump newfold-labs/wp-module-coming-soon
dependabot[bot] Dec 4, 2024
c00c641
exclude tests based on specific dependency - woo, jetpack, wonder
circlecube Dec 5, 2024
bc9ba30
Merge pull request #830 from newfold-labs/update/cypress-config-for-e…
circlecube Dec 5, 2024
8faa971
add version bump script and command
circlecube Dec 5, 2024
c379f8c
auto retry workflow step when wp install fails
circlecube Dec 5, 2024
f350a79
updated latam region.js
abhijitb Dec 6, 2024
3e884d4
Merge branch 'main' into update/latam-region-js
abhijitb Dec 6, 2024
03850d0
updated cyress test to check for correct support url
abhijitb Dec 6, 2024
6e00637
fix typo in the support url
abhijitb Dec 6, 2024
40b916f
Merge pull request #833 from newfold-labs/update/latam-region-js
circlecube Dec 6, 2024
2fc167d
Merge pull request #829 from newfold-labs/dependabot/composer/develop…
circlecube Dec 6, 2024
a92ff6d
Composer(deps): Bump newfold-labs/wp-module-data from 2.6.7 to 2.6.8
dependabot[bot] Dec 9, 2024
da05502
NPM Dev(deps-dev): Bump @wordpress/env from 10.12.0 to 10.14.0
dependabot[bot] Dec 11, 2024
d3dbb97
NPM(deps): Bump @wordpress/icons from 10.12.0 to 10.14.0
dependabot[bot] Dec 11, 2024
20591a0
NPM(deps): Bump @wordpress/compose from 7.12.0 to 7.14.0
dependabot[bot] Dec 11, 2024
f24fb80
Merge pull request #831 from newfold-labs/add/version-bump-script
circlecube Dec 11, 2024
54cf1b6
Merge pull request #834 from newfold-labs/dependabot/composer/develop…
circlecube Dec 11, 2024
a1bbed3
Merge pull request #836 from newfold-labs/dependabot/npm_and_yarn/dev…
circlecube Dec 11, 2024
3f7e023
Merge pull request #840 from newfold-labs/dependabot/npm_and_yarn/dev…
circlecube Dec 11, 2024
b487fdf
Merge pull request #838 from newfold-labs/dependabot/npm_and_yarn/dev…
circlecube Dec 11, 2024
6be1f33
Composer(deps): Bump newfold-labs/wp-module-help-center
dependabot[bot] Dec 11, 2024
95e7897
NPM(deps): Bump @wordpress/i18n from 5.12.0 to 5.14.0
dependabot[bot] Dec 11, 2024
420408c
NPM(deps): Bump @reduxjs/toolkit from 2.3.0 to 2.5.0
dependabot[bot] Dec 11, 2024
20503ba
Merge pull request #839 from newfold-labs/dependabot/npm_and_yarn/dev…
circlecube Dec 11, 2024
7e38a85
Merge pull request #837 from newfold-labs/dependabot/npm_and_yarn/dev…
circlecube Dec 11, 2024
a466727
Merge pull request #832 from newfold-labs/dependabot/composer/develop…
circlecube Dec 11, 2024
b7f1f2a
Composer(deps): Bump newfold-labs/wp-module-patterns from 2.8.0 to 2.8.1
dependabot[bot] Dec 11, 2024
9d5dea0
Merge pull request #835 from newfold-labs/dependabot/composer/develop…
circlecube Dec 11, 2024
0321b64
npm run set-version-bump - update to 2.12.4
circlecube Dec 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/cypress-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,11 @@ jobs:
echo '{"wpVersion": "${{ matrix.wpVersion }}","phpVersion": "${{ matrix.phpVersion }}"}' > cypress.env.json

- name: Install WordPress
run: npx wp-env start --debug
uses: nick-fields/retry@v3
with:
timeout_minutes: 4
max_attempts: 3
command: npx wp-env start --debug

- name: Run Cypress Tests
if: ${{ github.repository != 'newfold-labs/wp-plugin-hostgator' || github.actor == 'dependabot[bot]' }}
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/cypress-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,11 @@ jobs:
run: echo '{"config":{"WP_DEBUG_DISPLAY":false},"plugins":["${{ steps.workflow.outputs.DIST }}/${{ steps.workflow.outputs.PACKAGE }}"]}' > .wp-env.override.json

- name: Install WordPress
run: npx wp-env start --debug
uses: nick-fields/retry@v3
with:
timeout_minutes: 4
max_attempts: 3
command: npx wp-env start --debug

- name: Run Cypress Tests
if: ${{ github.repository != 'newfold-labs/wp-plugin-hostgator' || github.actor == 'dependabot[bot]' }}
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,20 +74,20 @@
"doctrine/inflector": "1.4.4 as 1.3.1",
"newfold-labs/wp-module-activation": "^1.0.5",
"newfold-labs/wp-module-atomic": "^1.3",
"newfold-labs/wp-module-coming-soon": "^1.3.1",
"newfold-labs/wp-module-coming-soon": "^1.3.2",
"newfold-labs/wp-module-context": "^1.0.1",
"newfold-labs/wp-module-data": "^2.6.7",
"newfold-labs/wp-module-data": "^2.6.8",
"newfold-labs/wp-module-deactivation": "^1.2.3",
"newfold-labs/wp-module-ecommerce": "^1.4.4",
"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.2",
"newfold-labs/wp-module-loader": "^1.0.10",
"newfold-labs/wp-module-marketplace": "^2.4.0",
"newfold-labs/wp-module-migration": "^1.0.12",
"newfold-labs/wp-module-notifications": "^1.6.6",
"newfold-labs/wp-module-onboarding": "^2.5.5",
"newfold-labs/wp-module-patterns": "^2.8.0",
"newfold-labs/wp-module-patterns": "^2.8.1",
"newfold-labs/wp-module-performance": "2.0.1 as 1.9.9",
"newfold-labs/wp-module-runtime": "^1.0.12",
"newfold-labs/wp-module-secure-passwords": "^1.1.1",
Expand Down
82 changes: 41 additions & 41 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 52 additions & 10 deletions cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ module.exports = defineConfig({
// You may want to clean this up later by importing these.
setupNodeEvents(on, config) {

const semver = require('semver');

// Ensure that the base URL is always properly set.
if (config.env && config.env.baseUrl) {
config.baseUrl = config.env.baseUrl;
Expand All @@ -56,17 +54,27 @@ module.exports = defineConfig({
}
}

// Exclude tests for WordPress lower than 6.5 (6.4 or 6.3) or PHP lower than 7.4 (7.1, 7.2 and 7.3)
if (
semver.satisfies( config.env.wpSemverVersion, '<6.5.0' ) ||
semver.satisfies( config.env.phpSemverVersion, '<7.4.0' )
) {
// Tests require Wondor Theme, exclude if not supported due to WP or PHP versions
if ( ! supportsWonderTheme( config.env ) ) {
config.excludeSpecPattern = config.excludeSpecPattern.concat( [
'vendor/newfold-labs/wp-module-onboarding/tests/cypress/integration/**', // Onboarding requires Wonder Theme
'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Home/ecommerce-next-steps.cy.js', // Requires Onboarding
] );
}

// Tests requires Woo, so exclude if not supported due to WP or PHP versions
if ( ! supportsWoo( config.env ) ) {
config.excludeSpecPattern = config.excludeSpecPattern.concat( [
'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Site-Capabilities/**',
'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Home/homePageWithWoo.cy.js',
'vendor/newfold-labs/wp-module-ecommerce/tests/cypress/integration/Home/ecommerce-next-steps.cy.js', // Skip this since Onboarding does not support this version
'vendor/newfold-labs/wp-module-onboarding/tests/cypress/integration/**', // Onboarding requires WP 6.5 or greater, as it uses the Wonder Theme which has the same requirement
'vendor/newfold-labs/wp-module-coming-soon/tests/cypress/integration/coming-soon-woo.cy.js', // woo is required and is not supported in older WP or PHP
'vendor/newfold-labs/wp-module-coming-soon/tests/cypress/integration/coming-soon-woo.cy.js',
] );
}

// Test requires Jetpack, so exclude if not supported due to WP or PHP versions
if ( ! supportsJetpack( config.env ) ) {
config.excludeSpecPattern = config.excludeSpecPattern.concat( [
'vendor/newfold-labs/wp-module-solutions/tests/cypress/integration/wp-plugins-installation-check.cy.js',
] );
}

Expand All @@ -88,3 +96,37 @@ module.exports = defineConfig({
retries: 1,
experimentalMemoryManagement: true,
})

// Check against plugin support at https://wordpress.org/plugins/woocommerce/
const supportsWoo = ( env ) => {
const semver = require( 'semver' );
if (
semver.satisfies( env.wpSemverVersion, '>=6.5.0' ) &&
semver.satisfies( env.phpSemverVersion, '>=7.4.0' )
) {
return true;
}
return false;
};
// Check against plugin support at https://wordpress.org/plugins/jetpack/
const supportsJetpack = ( env ) => {
const semver = require( 'semver' );
if (
semver.satisfies( env.wpSemverVersion, '>=6.6.0' ) &&
semver.satisfies( env.phpSemverVersion, '>=7.2.0' )
) {
return true;
}
return false;
};
// Check against theme support at https://github.com/newfold-labs/yith-wonder/blob/master/style.css
const supportsWonderTheme = ( env ) => {
const semver = require( 'semver' );
if (
semver.satisfies( env.wpSemverVersion, '>=6.5.0' ) &&
semver.satisfies( env.phpSemverVersion, '>=7.0.0' )
) {
return true;
}
return false;
};
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"translation-revision-date": "2023-08-24 18:27",
"generator": "WP-CLI\/2.11.0",
"source": "build\/2.12.3\/index.js",
"source": "build\/2.12.4\/index.js",
"domain": "messages",
"locale_data": {
"messages": {
Expand Down
Loading
Loading