Skip to content

Commit ee85f43

Browse files
authored
Merge branch 'develop' into dependabot/composer/phpstan/phpstan-1.12.14
2 parents 3d13637 + d3c0bd3 commit ee85f43

11 files changed

+667
-594
lines changed

Diff for: .github/workflows/build-test-measure.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -335,11 +335,11 @@ jobs:
335335
external-http: true
336336

337337
- php: '7.4'
338-
wp: '6.5'
338+
wp: '6.6'
339339
phpunit: '7'
340340

341341
- php: '7.4'
342-
wp: '6.5'
342+
wp: '6.6'
343343
phpunit: '7'
344344
external-http: true
345345
steps:
@@ -408,6 +408,9 @@ jobs:
408408
# The JSON file is provided by the `shivammathur/setup-php` action. See https://github.com/shivammathur/setup-php#problem-matchers.
409409
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
410410

411+
- name: Install SVN
412+
run: sudo apt-get install subversion
413+
411414
- name: Install WP tests
412415
if: needs.pre-run.outputs.changed-php-count > 0
413416
run: bash bin/ci/install-wp-tests.sh wordpress_test root '' 127.0.0.1:${{ job.services.mysql.ports['3306'] }} ${{ matrix.wp }} true
@@ -518,7 +521,7 @@ jobs:
518521
wp: 'latest'
519522

520523
- php: '7.4'
521-
wp: '6.5'
524+
wp: '6.6'
522525
steps:
523526
- name: Shutdown default MySQL service
524527
if: needs.pre-run.outputs.changed-php-count > 0

Diff for: amp.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Version: 2.5.6-alpha
99
* License: GPLv2 or later
1010
* License URI: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
11-
* Requires at least: 6.5
11+
* Requires at least: 6.6
1212
* Requires PHP: 7.4
1313
* Text Domain: amp
1414
*

0 commit comments

Comments
 (0)