Skip to content

Commit

Permalink
Merge branch 'trunk' into update/components/threat-details-modal-flow
Browse files Browse the repository at this point in the history
  • Loading branch information
dkmyta committed Nov 21, 2024
2 parents 242ca8f + 2553e23 commit 9151f92
Show file tree
Hide file tree
Showing 186 changed files with 1,677 additions and 5,063 deletions.
2 changes: 1 addition & 1 deletion .github/files/generate-ci-matrix.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
$matrix = array();

// Add PHP tests.
foreach ( array( '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ) as $php ) {
foreach ( array( '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ) as $php ) {
$matrix[] = array(
'name' => "PHP tests: PHP $php WP latest",
'script' => 'test-php',
Expand Down
7 changes: 5 additions & 2 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
labels: [ '[Type] Janitorial', '[Status] Needs Review' ],
prHourlyLimit: 1,
timezone: 'UTC',
schedule: [ 'before 3am on the first day of the month' ],
schedule: [ '* 0-2 1 * *' ],
updateNotScheduled: false,
semanticCommits: 'disabled',
osvVulnerabilityAlerts: true,
Expand All @@ -20,6 +20,9 @@
'**/test/**',
'**/tests/!(e2e)/**',
'**/__fixtures__/**',
// Old unused wpcomsh stuff that we're only keeping temporarily until we figure out how to properly replace it.
'**/projects/plugins/wpcomsh/.circleci/**',
'**/projects/plugins/wpcomsh/.github/**',
],

packageRules: [
Expand Down Expand Up @@ -145,7 +148,7 @@

lockFileMaintenance: {
enabled: true,
schedule: [ 'before 3:00 am on Monday on the 7th through 13th day of the month' ],
schedule: [ '* 0-2 7-13 * 1' ],
},
dependencyDashboardTitle: 'Renovate Dependency Updates',
dependencyDashboardLabels: [ 'Primary Issue', '[Type] Janitorial' ],
Expand Down
2 changes: 1 addition & 1 deletion .github/versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ PNPM_VERSION=9.3.0

# Other useful version numbers.
MIN_PHP_VERSION=7.2
MAX_PHP_VERSION=8.3
MAX_PHP_VERSION=8.4
2 changes: 1 addition & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: [ '7.2', '7.4', '8.0', '8.1', '8.2', '8.3' ]
php-versions: [ '7.2', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
experimental: [ false ]

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/renovate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ jobs:
TOKEN: ${{ secrets.RENOVATE_TOKEN }}
run: |
curl --no-progress-meter --header "Authorization: Bearer $TOKEN" https://api.github.com/rate_limit
- uses: renovatebot/github-action@v40.1.5
- uses: renovatebot/github-action@v41.0.3
with:
configurationFile: /tmp/monorepo/.github/renovate-config.js
token: ${{ secrets.RENOVATE_TOKEN }}
mount-docker-socket: true
renovate-version: 38.57.3
renovate-version: 39.22.0
env:
LOG_LEVEL: ${{ github.event.inputs.logLevel || 'debug' }}
RENOVATE_DRY_RUN: ${{ github.event.inputs.dryRun == 'no' && 'null' || github.event.inputs.dryRun || 'null' }}
Expand Down
13 changes: 12 additions & 1 deletion .phan/stubs/akismet-stubs.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
<?php
/**
* Stubs automatically generated from Akismet 5.3.3
* Stubs automatically generated from Akismet 5.3.5
* using the definition file `tools/stubs/akismet-stub-defs.php` in the Jetpack monorepo.
*
* Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.
*/

// We plan to gradually remove all of the disabled lint rules below.
// phpcs:disable WordPress.Security.ValidatedSanitizedInput.MissingUnslash
// phpcs:disable WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
// phpcs:disable WordPress.Security.NonceVerification.Missing
// phpcs:disable Squiz.PHP.DisallowMultipleAssignments.FoundInControlStructure
class Akismet
{
public static function get_api_key()
Expand Down Expand Up @@ -43,6 +48,12 @@ public static function http_post($request, $path, $ip = \null)
{
}
}
// We plan to gradually remove all of the disabled lint rules below.
// phpcs:disable WordPress.Security.ValidatedSanitizedInput.InputNotValidated
// phpcs:disable WordPress.Security.ValidatedSanitizedInput.MissingUnslash
// phpcs:disable WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
// phpcs:disable Squiz.PHP.DisallowMultipleAssignments.FoundInControlStructure
// phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped
class Akismet_Admin
{
public static function admin_menu()
Expand Down
2 changes: 1 addition & 1 deletion .phan/stubs/woocommerce-internal-stubs.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Stubs automatically generated from WooCommerce 9.4.1
* Stubs automatically generated from WooCommerce 9.4.2
* using the definition file `tools/stubs/woocommerce-internal-stub-defs.php` in the Jetpack monorepo.
*
* Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.
Expand Down
Loading

0 comments on commit 9151f92

Please sign in to comment.