Skip to content

Commit 84d4c65

Browse files
committed
Merge branch 'develop' into fix-allow-optimal-performance-blending-weight-auto-selection
2 parents 696e8b7 + 0f4fe99 commit 84d4c65

File tree

14 files changed

+811
-789
lines changed

14 files changed

+811
-789
lines changed

.github/workflows/integration-tests.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,18 @@ jobs:
2929
# - coverage: Whether to run the tests with code coverage.
3030
# - experimental: Whether the build is "allowed to fail".
3131
matrix:
32-
php: ['7.4', '8.0', '8.1', '8.2']
32+
php: ['7.4', '8.0', '8.1', '8.2', '8.3']
3333
wp: ['latest']
3434
coverage: [none]
3535
experimental: [false]
3636
include:
37-
- php: '8.3'
37+
- php: '8.4'
3838
coverage: pcov
3939
extensions: pcov
4040
ini-values: pcov.directory=., "pcov.exclude=\"~(vendor|tests)~\""
4141
experimental: false
42-
- php: '8.4'
42+
- php: '8.5'
4343
wp: 'trunk'
44-
coverage: none
4544
experimental: true
4645
fail-fast: false
4746
continue-on-error: ${{ matrix.experimental }}

.github/workflows/unit-tests.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,16 @@ jobs:
3030
# - coverage: Whether to run the tests with code coverage.
3131
# - experimental: Whether the build is "allowed to fail".
3232
matrix:
33-
php: ['7.4', '8.0', '8.1', '8.2']
33+
php: ['7.4', '8.0', '8.1', '8.2', '8.3']
3434
coverage: [none]
3535
experimental: [false]
3636
include:
37-
- php: '8.3'
37+
- php: '8.4'
3838
coverage: pcov
3939
extensions: pcov
4040
ini-values: pcov.directory=., "pcov.exclude=\"~(vendor|tests)~\""
4141
experimental: false
42-
- php: '8.4'
43-
coverage: none
42+
- php: '8.5'
4443
experimental: true
4544
fail-fast: false
4645
continue-on-error: ${{ matrix.experimental }}

build/admin-settings.asset.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-data', 'wp-escape-html', 'wp-i18n', 'wp-url'), 'version' => '66f2b3e882defbfd9d95');
1+
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-data', 'wp-escape-html', 'wp-i18n', 'wp-url'), 'version' => '2241911e2fdfed629bf6');

build/admin-settings.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-dom-ready', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-notices', 'wp-primitives', 'wp-url'), 'version' => '70b66d4daf13e08c9f9c');
1+
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-dom-ready', 'wp-element', 'wp-escape-html', 'wp-i18n', 'wp-notices', 'wp-primitives', 'wp-url'), 'version' => '582c1c29d022bacbb8b4');

build/content-helper/dashboard-page.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => '9dd4e7d94d11e6d6f594');
1+
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => '880b3ef462175993e9b1');

build/content-helper/dashboard-widget.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom-ready', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url', 'wp-wordcount'), 'version' => '3aca3610bec0d7b11473');
1+
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom-ready', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url', 'wp-wordcount'), 'version' => '84075f31925e3bed158a');

build/content-helper/editor-sidebar.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)