Skip to content

Commit

Permalink
Merge branch 'develop' into update/new-ui
Browse files Browse the repository at this point in the history
* develop:
  clean up npm package file
  update data module
  wp version bump
  version bump
  NPM Dev(deps-dev): Bump @wordpress/scripts from 26.6.0 to 26.9.0
  NPM(deps): Bump @wordpress/dom-ready from 3.35.0 to 3.38.0
  NPM(deps): Bump @wordpress/compose from 6.12.0 to 6.15.0
  NPM(deps): Bump @wordpress/icons from 9.26.0 to 9.29.0
  NPM Dev(deps-dev): Bump cypress from 12.14.0 to 12.17.3
  NPM(deps): Bump @wordpress/i18n from 4.35.0 to 4.38.0
  NPM Dev(deps-dev): Bump @replayio/cypress from 1.0.2 to 1.1.2
  Composer Dev(deps-dev): Bump wp-phpunit/wp-phpunit from 6.2.0 to 6.2.2
  Composer(deps): Bump newfold-labs/wp-module-data from 2.3.4 to 2.4.2
  NPM Dev(deps-dev): Bump @wordpress/env from 5.16.0 to 8.4.0
  NPM(deps): Bump react-router-dom from 6.12.1 to 6.14.2
  GitHub Actions(deps): Bump replayio/action-cypress from 0.3.0 to 0.3.1

# Conflicts:
#	package-lock.json
#	package.json
  • Loading branch information
circlecube committed Aug 23, 2023
2 parents c429bbc + fb4e114 commit c9df97c
Show file tree
Hide file tree
Showing 8 changed files with 229 additions and 224 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cypress-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ jobs:
- '8.1'
- '8.2'
wpVersion:
- '6.0'
- '6.1'
- '6.2'
- '6.3'

steps:

Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
run: npx cypress run

- name: Run Cypress Tests
uses: replayio/action-cypress@v0.3.0
uses: replayio/action-cypress@v0.3.1
env:
RECORD_REPLAY_METADATA_TEST_RUN_TITLE: "php-${{ matrix.phpVersion }}, wp-${{ matrix.wpVersion }}"
RECORD_REPLAY_API_KEY: ${{ secrets.RECORD_REPLAY_API_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cypress-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
run: npx cypress run

- name: Run Cypress Tests
uses: replayio/action-cypress@v0.3.0
uses: replayio/action-cypress@v0.3.1
env:
RECORD_REPLAY_API_KEY: ${{ secrets.RECORD_REPLAY_API_KEY }}
if: ${{ github.repository == 'newfold-labs/wp-plugin-hostgator' && env.RECORD_REPLAY_API_KEY != '' }}
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.2.2",
"core": "WordPress/WordPress#tags/6.3",
"config": {
"WP_DEBUG": true,
"WP_DEBUG_LOG": true,
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"require": {
"doctrine/inflector": "1.2.0 as 1.3.1",
"newfold-labs/wp-module-coming-soon": "^1.1.3",
"newfold-labs/wp-module-data": "^2.3.4",
"newfold-labs/wp-module-data": "^2.4.3",
"newfold-labs/wp-module-loader": "^1.0.10",
"newfold-labs/wp-module-marketplace": "^1.5.1",
"newfold-labs/wp-module-notifications": "^1.1.2",
Expand Down
45 changes: 22 additions & 23 deletions composer.lock

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

Loading

0 comments on commit c9df97c

Please sign in to comment.