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

Production release: v20250114.0 #6098

Merged
merged 18 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5c01feb
ci: install `svn` before running tests (#6065)
sjinks Dec 20, 2024
5c8358c
chore(deps): Bump sjinks/setup-wordpress-test-library (#6052)
dependabot[bot] Dec 20, 2024
e76790b
chore(deps-dev): Bump @types/node in /__tests__/e2e (#6063)
dependabot[bot] Dec 20, 2024
d98388c
chore(deps-dev): Bump @playwright/test in /__tests__/e2e (#6062)
dependabot[bot] Dec 20, 2024
dbc956f
chore(deps): Bump github/codeql-action from 3.27.6 to 3.28.0 (#6066)
dependabot[bot] Dec 20, 2024
93c2849
chore(deps): Bump softprops/action-gh-release from 2.1.0 to 2.2.0 (#6…
dependabot[bot] Dec 20, 2024
60780fe
chore(deps): Bump codecov/codecov-action (#6069)
dependabot[bot] Dec 24, 2024
1eae63a
Actually bump minimum Parse.ly version to 3.15 in parsely.yml workflo…
rinatkhaziev Jan 6, 2025
a04acc8
Remove older Parse.ly versions (#6064)
rinatkhaziev Jan 6, 2025
2443dcb
Alloptions cli tweaks (#6072)
trepmal Jan 7, 2025
5eeadec
chore(deps): Bump @wordpress/i18n from 5.13.0 to 5.15.1 (#6079)
dependabot[bot] Jan 7, 2025
ce48e2d
chore(deps-dev): Bump @wordpress/env from 10.13.0 to 10.15.0 (#6078)
dependabot[bot] Jan 7, 2025
a9d6ecd
chore(deps): Bump shivammathur/setup-php (#6074)
dependabot[bot] Jan 7, 2025
bd607ee
chore(deps-dev): Bump @types/node in /__tests__/e2e (#6077)
dependabot[bot] Jan 7, 2025
75b00e2
chore(deps-dev): Bump sass in /search/search-dev-tools (#6076)
dependabot[bot] Jan 7, 2025
0264f1d
chore(deps-dev): Bump lint-staged from 15.2.10 to 15.3.0 (#6075)
dependabot[bot] Jan 7, 2025
02d5c02
Merge pull request #6081 from Automattic/develop
luiztiago Jan 7, 2025
86eeabe
Add VIP_SEARCH_ENABLED_BY (#6082)
rebeccahum Jan 8, 2025
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: 7 additions & 3 deletions .github/actions/run-wp-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,12 @@ runs:
echo "ini=apc.enable_cli=1, opcache.enable_cli=1" >> $GITHUB_OUTPUT
fi

- name: Install svn
run: sudo apt-get update && sudo apt-get install -y subversion
shell: bash

- name: Set up PHP
uses: shivammathur/setup-php@2.31.1
uses: shivammathur/setup-php@2.32.0
with:
coverage: ${{ steps.coverage.outputs.coverage }}
ini-values: ${{ steps.coverage.outputs.ini }}
Expand All @@ -80,7 +84,7 @@ runs:
uses: ramsey/[email protected]

- name: Set up WordPress and WordPress Test Library
uses: sjinks/[email protected].2
uses: sjinks/[email protected].3
with:
version: ${{ inputs.wordpress }}

Expand Down Expand Up @@ -122,7 +126,7 @@ runs:
"${PHPUNIT}" ${OPTIONS}

- name: Upload coverage report
uses: codecov/[email protected].1
uses: codecov/[email protected].2
with:
files: ${{ inputs.coverage-file }}
flags: ${{ inputs.coverage-flags }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog-summary-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- uses: softprops/action-gh-release@v2.1.0
- uses: softprops/action-gh-release@v2.2.0
with:
generate_release_notes: true
tag_name: ${{ steps.id-generator.outputs.id }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
uses: actions/[email protected]

- name: Initialize CodeQL
uses: github/codeql-action/init@v3.27.6
uses: github/codeql-action/init@v3.28.0
with:
languages: ${{ matrix.language }}
config-file: ./.github/codeql-config.yml

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3.27.6
uses: github/codeql-action/analyze@v3.28.0
4 changes: 2 additions & 2 deletions .github/workflows/parsely.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jobs:
matrix:
config:
# Oldest version of the parsely plugin
- { wp: latest, parsely: '3.5', mode: 'filter_enabled', php: '8.1' }
- { wp: latest, parsely: '3.5', mode: 'filter_disabled', php: '8.1' }
- { wp: latest, parsely: '3.15', mode: 'filter_enabled', php: '8.1' }
- { wp: latest, parsely: '3.15', mode: 'filter_disabled', php: '8.1' }

# Latest version of the parsely plugin
- { wp: latest, mode: 'filter_enabled', php: '8.1' }
Expand Down
3 changes: 3 additions & 0 deletions 000-vip-init.php
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,9 @@
if ( ( defined( 'USE_VIP_ELASTICSEARCH' ) && USE_VIP_ELASTICSEARCH ) || // legacy constant name
( defined( 'VIP_ENABLE_VIP_SEARCH' ) && true === VIP_ENABLE_VIP_SEARCH ) ) {
require_once __DIR__ . '/search/search.php';
if ( ! defined( 'VIP_SEARCH_ENABLED_BY' ) ) {
define( 'VIP_SEARCH_ENABLED_BY', 'constant' );
}
}

// Set WordPress environment type
Expand Down
28 changes: 14 additions & 14 deletions __tests__/e2e/package-lock.json

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

2 changes: 2 additions & 0 deletions config/class-site-details-index.php
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,12 @@ public function get_search_info() {
$search_info['enabled'] = true;
$search_info['query_integration_enabled'] = \Automattic\VIP\Search\Search::is_query_integration_enabled();
$search_info['network_enabled'] = defined( 'EP_IS_NETWORK' ) && true === constant( 'EP_IS_NETWORK' );
$search_info['enabled_by'] = defined( 'VIP_SEARCH_ENABLED_BY' ) ? constant( 'VIP_SEARCH_ENABLED_BY' ) : 'unknown';
} else {
$search_info['enabled'] = false;
$search_info['query_integration_enabled'] = false;
$search_info['network_enabled'] = false;
$search_info['enabled_by'] = false;
}

return $search_info;
Expand Down
4 changes: 4 additions & 0 deletions integrations/enterprise-search.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ public function load(): void {
} else {
require_once __DIR__ . '/../search/search.php';
}

if ( ! defined( 'VIP_SEARCH_ENABLED_BY' ) ) {
define( 'VIP_SEARCH_ENABLED_BY', 'integration' );
}
}

/**
Expand Down
Loading
Loading