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/3.2.5 #391

Merged
merged 47 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
ef86972
NPM(deps): Bump react-error-boundary from 4.0.13 to 4.1.2
dependabot[bot] Nov 1, 2024
f5d0f59
NPM Dev(deps-dev): Bump axe-core from 4.10.0 to 4.10.2
dependabot[bot] Nov 6, 2024
632c200
Composer Dev(deps-dev): Bump wp-phpunit/wp-phpunit from 6.6.2 to 6.7.0
dependabot[bot] Nov 13, 2024
9b2745d
NPM Dev(deps-dev): Bump tailwindcss from 3.4.13 to 3.4.15
dependabot[bot] Nov 15, 2024
5e8c08e
Merge pull request #372 from newfold-labs/dependabot/composer/develop…
circlecube Nov 15, 2024
5c4915f
Composer(deps): Bump newfold-labs/wp-module-data from 2.6.5 to 2.6.6
dependabot[bot] Nov 15, 2024
f186aff
update to wp 6.7
circlecube Nov 15, 2024
95f8db5
update cypress tests with testIsolation
circlecube Nov 15, 2024
1a3dcf0
Merge pull request #370 from newfold-labs/dependabot/composer/develop…
circlecube Nov 15, 2024
d091a56
Composer(deps): Bump newfold-labs/wp-module-sso from 1.0.6 to 1.0.7
dependabot[bot] Nov 15, 2024
132e7bd
NPM(deps): Bump @wordpress/element from 6.8.0 to 6.12.0
dependabot[bot] Nov 18, 2024
d777b5b
Merge pull request #375 from newfold-labs/update/cypress-test-isolation
circlecube Nov 20, 2024
c1a68d9
Merge pull request #368 from newfold-labs/dependabot/composer/develop…
circlecube Nov 20, 2024
d05fcf2
Composer(deps): Bump newfold-labs/wp-module-data from 2.6.6 to 2.6.7
dependabot[bot] Nov 20, 2024
6552652
Merge pull request #374 from newfold-labs/dependabot/npm_and_yarn/dev…
circlecube Nov 20, 2024
eef3989
Merge pull request #363 from newfold-labs/dependabot/npm_and_yarn/dev…
circlecube Nov 20, 2024
67b8d28
Merge pull request #364 from newfold-labs/dependabot/npm_and_yarn/dev…
circlecube Nov 20, 2024
acb9f38
Merge pull request #376 from newfold-labs/dependabot/npm_and_yarn/dev…
circlecube Nov 20, 2024
54b4285
Merge pull request #378 from newfold-labs/dependabot/composer/develop…
circlecube Nov 20, 2024
e388909
NPM(deps): Bump react-router-dom from 6.26.2 to 6.28.0
dependabot[bot] Nov 20, 2024
6a7df86
Composer(deps): Bump newfold-labs/wp-module-notifications
dependabot[bot] Nov 20, 2024
010dbe3
Merge pull request #369 from newfold-labs/dependabot/npm_and_yarn/dev…
circlecube Nov 20, 2024
a1b50e8
Merge pull request #377 from newfold-labs/dependabot/composer/develop…
circlecube Nov 20, 2024
8b0cb82
Composer(deps): Bump newfold-labs/wp-module-coming-soon
dependabot[bot] Nov 20, 2024
e63b086
Merge pull request #371 from newfold-labs/dependabot/composer/develop…
circlecube Nov 20, 2024
e7443e9
NPM(deps): Bump @heroicons/react from 2.1.5 to 2.2.0
dependabot[bot] Nov 21, 2024
c705063
Composer Dev(deps-dev): Bump wp-phpunit/wp-phpunit from 6.7.0 to 6.7.1
dependabot[bot] Nov 22, 2024
77aa690
NPM Dev(deps-dev): Bump @wordpress/env from 10.11.0 to 10.13.0
dependabot[bot] Nov 27, 2024
a0b44a5
NPM(deps): Bump @wordpress/i18n from 5.11.0 to 5.13.0
dependabot[bot] Nov 27, 2024
059d592
NPM Dev(deps-dev): Bump cypress from 13.15.0 to 13.16.1
dependabot[bot] Dec 5, 2024
8b9cf80
Merge pull request #384 from newfold-labs/dependabot/composer/develop…
circlecube Dec 5, 2024
b3d8b52
Composer(deps): Bump newfold-labs/wp-module-coming-soon
dependabot[bot] Dec 5, 2024
026b99e
Merge pull request #389 from newfold-labs/dependabot/composer/develop…
circlecube Dec 5, 2024
14091e4
Merge pull request #386 from newfold-labs/dependabot/npm_and_yarn/dev…
circlecube Dec 5, 2024
a290166
Merge pull request #390 from newfold-labs/dependabot/npm_and_yarn/dev…
circlecube Dec 5, 2024
faef4e1
Merge pull request #379 from newfold-labs/dependabot/npm_and_yarn/dev…
circlecube Dec 5, 2024
254d8d1
Merge pull request #387 from newfold-labs/dependabot/npm_and_yarn/dev…
circlecube Dec 5, 2024
f6f8748
NPM Dev(deps-dev): Bump @wordpress/scripts from 30.4.0 to 30.6.0
dependabot[bot] Dec 5, 2024
77fe843
Merge pull request #388 from newfold-labs/dependabot/npm_and_yarn/dev…
circlecube Dec 5, 2024
1441085
add version bump script
circlecube Dec 5, 2024
b048be1
update cypress config for coming soon woo requirement
circlecube Dec 5, 2024
01fe36d
ran `npm run set-version-bump` to bump version to 3.2.5
circlecube Dec 5, 2024
f3e5e26
update wp version to 6.7.1
circlecube Dec 5, 2024
8d8d57f
npm dependency updates
circlecube Dec 5, 2024
1b13d6f
update composer dependencies
circlecube Dec 5, 2024
f1de2ee
auto retry workflow step when wp install fails
circlecube Dec 5, 2024
353565c
add php7.1 wp6.7 to the exclude list in matrix because wp6.7 requires…
circlecube Dec 6, 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
10 changes: 8 additions & 2 deletions .github/workflows/cypress-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,14 @@ jobs:
- '8.2'
- '8.3'
wpVersion:
- '6.4'
- '6.5'
- '6.6'
- '6.7'
exclude:
- phpVersion: '7.1'
wpVersion: '6.6'
- phpVersion: '7.1'
wpVersion: '6.7'

steps:

Expand Down Expand Up @@ -115,7 +117,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-mojo' || github.actor == 'dependabot[bot]' }}
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,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 @wordpress/env@latest start
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-mojo' || github.actor == 'dependabot[bot]' }}
Expand Down
2 changes: 1 addition & 1 deletion .wp-env.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"core": "WordPress/WordPress#tags/6.6.2",
"core": "WordPress/WordPress#tags/6.7.1",
"config": {
"WP_DEBUG": true,
"WP_DEBUG_LOG": true,
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"newfold-labs/wp-php-standards": "^1.2.4",
"roave/security-advisories": "dev-latest",
"wp-cli/i18n-command": "^2.6.3",
"wp-phpunit/wp-phpunit": "^6.6.2"
"wp-phpunit/wp-phpunit": "^6.7.1"
},
"scripts": {
"fix": "vendor/bin/phpcbf --standard=phpcs.xml .",
Expand Down Expand Up @@ -71,18 +71,18 @@
"doctrine/inflector": "1.2.0 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.2.6",
"newfold-labs/wp-module-coming-soon": "^1.3.2",
"newfold-labs/wp-module-context": "^1.0.1",
"newfold-labs/wp-module-data": "^2.6.5",
"newfold-labs/wp-module-data": "^2.6.7",
"newfold-labs/wp-module-deactivation": "^1.2.3",
"newfold-labs/wp-module-features": "^1.4.2",
"newfold-labs/wp-module-loader": "^1.0.10",
"newfold-labs/wp-module-marketplace": "^2.4.0",
"newfold-labs/wp-module-notifications": "^1.6.2",
"newfold-labs/wp-module-notifications": "^1.6.6",
"newfold-labs/wp-module-performance": "^2.0.1",
"newfold-labs/wp-module-runtime": "^1.0.12",
"newfold-labs/wp-module-secure-passwords": "^1.1.1",
"newfold-labs/wp-module-sso": "^1.0.6",
"newfold-labs/wp-module-sso": "^1.0.7",
"wp-forge/wp-update-handler": "^1.0.2",
"wp-forge/wp-upgrade-handler": "^1.0"
}
Expand Down
171 changes: 95 additions & 76 deletions composer.lock

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@ module.exports = defineConfig({
}
}

// 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-coming-soon/tests/cypress/integration/coming-soon-woo.cy.js',
] );
}

on('task', {
log(message) {
console.log(message)
Expand Down Expand Up @@ -84,3 +91,15 @@ 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;
};
Loading
Loading