Skip to content

Commit f18a889

Browse files
rinatkhazievrinatkhaziev
authored
Merge branch 'develop' into add/users-last-seen
2 parents 0bad466 + 40053c7 commit f18a889

File tree

218 files changed

+12673
-18282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+12673
-18282
lines changed

‎.dockerignore

-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ wpcom-helper.php
9999
/shared-plugins/two-factor/dev-lib/
100100
/shared-plugins/two-factor/tests/
101101
**/tests/
102-
/vaultpress/changelog.txt
103102
/vip-support/.circleci
104103
/vip-support/bin/
105104
/vip-support/features/

‎.github/actions/prepare-source/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runs:
44
using: composite
55
steps:
66
- name: Check out mu-plugins-ext
7-
uses: actions/checkout@v4.1.7
7+
uses: actions/checkout@v4.2.2
88
with:
99
repository: 'Automattic/vip-go-mu-plugins-ext'
1010
path: 'vip-go-mu-plugins-ext'

‎.github/actions/run-wp-tests/action.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,12 @@ runs:
6060
echo "ini=apc.enable_cli=1, opcache.enable_cli=1" >> $GITHUB_OUTPUT
6161
fi
6262
63+
- name: Install svn
64+
run: sudo apt-get update && sudo apt-get install -y subversion
65+
shell: bash
66+
6367
- name: Set up PHP
64-
uses: shivammathur/setup-php@2.31.0
68+
uses: shivammathur/setup-php@2.32.0
6569
with:
6670
coverage: ${{ steps.coverage.outputs.coverage }}
6771
ini-values: ${{ steps.coverage.outputs.ini }}
@@ -80,7 +84,7 @@ runs:
8084
uses: ramsey/[email protected]
8185

8286
- name: Set up WordPress and WordPress Test Library
83-
uses: sjinks/setup-wordpress-test-library@2.0.2
87+
uses: sjinks/setup-wordpress-test-library@v2.1.3
8488
with:
8589
version: ${{ inputs.wordpress }}
8690

@@ -122,7 +126,7 @@ runs:
122126
"${PHPUNIT}" ${OPTIONS}
123127
124128
- name: Upload coverage report
125-
uses: codecov/codecov-action@v4.5.0
129+
uses: codecov/codecov-action@v5.1.2
126130
with:
127131
files: ${{ inputs.coverage-file }}
128132
flags: ${{ inputs.coverage-flags }}

‎.github/workflows/changelog-summary-prod.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
egress-policy: audit
2626

2727
- name: Check out source code
28-
uses: actions/checkout@v4.1.7
28+
uses: actions/checkout@v4.2.2
2929

3030
- name: Retrieve tags
3131
run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
@@ -50,7 +50,7 @@ jobs:
5050
env:
5151
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5252

53-
- uses: softprops/action-gh-release@v2.0.6
53+
- uses: softprops/action-gh-release@v2.2.0
5454
with:
5555
generate_release_notes: true
5656
tag_name: ${{ steps.id-generator.outputs.id }}
@@ -61,7 +61,7 @@ jobs:
6161
runs-on: ubuntu-latest
6262
steps:
6363
- name: Checkout repository
64-
uses: actions/checkout@v4.1.7
64+
uses: actions/checkout@v4.2.2
6565

6666
- name: Setup PHP
6767
uses: shivammathur/[email protected]

‎.github/workflows/changelog-summary-staging.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v4.1.7
19+
uses: actions/checkout@v4.2.2
2020

2121
- name: Setup PHP
2222
uses: shivammathur/[email protected]

‎.github/workflows/ci.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ jobs:
2828
matrix:
2929
config:
3030
# PHP 8.1, Jetpack
31-
- { wp: 6.0.x, ms: 'no', jp: 'yes', php: '8.1', phpunit: '' }
32-
- { wp: 6.0.x, ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
33-
- { wp: 6.1.x, ms: 'no', jp: 'yes', php: '8.1', phpunit: '' }
34-
- { wp: 6.1.x, ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
3531
- { wp: 6.2.x, ms: 'no', jp: 'yes', php: '8.1', phpunit: '' }
3632
- { wp: 6.2.x, ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
3733
- { wp: 6.3.x, ms: 'no', jp: 'yes', php: '8.1', phpunit: '' }
3834
- { wp: 6.3.x, ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
3935
- { wp: 6.4.x, ms: 'no', jp: 'yes', php: '8.1', phpunit: '' }
4036
- { wp: 6.4.x, ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
37+
- { wp: 6.5.x, ms: 'no', jp: 'yes', php: '8.1', phpunit: '' }
38+
- { wp: 6.5.x, ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
39+
- { wp: 6.6.x, ms: 'no', jp: 'yes', php: '8.1', phpunit: '' }
40+
- { wp: 6.6.x, ms: 'yes', jp: 'yes', php: '8.1', phpunit: '' }
4141
- { wp: latest, ms: 'no', jp: 'yes', php: '8.1', phpunit: '', coverage: 'yes' }
4242
- { wp: latest, ms: 'yes', jp: 'yes', php: '8.1', phpunit: '', coverage: 'yes' }
4343
- { wp: nightly, ms: 'no', jp: 'yes', php: '8.1', phpunit: '' }
@@ -64,7 +64,7 @@ jobs:
6464
MYSQL_DATABASE: wordpress_test
6565
steps:
6666
- name: Check out source code
67-
uses: actions/checkout@v4.1.7
67+
uses: actions/checkout@v4.2.2
6868
with:
6969
submodules: recursive
7070

‎.github/workflows/codeql-analysis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ jobs:
2929
- javascript
3030
steps:
3131
- name: Checkout repository
32-
uses: actions/checkout@v4.1.7
32+
uses: actions/checkout@v4.2.2
3333

3434
- name: Initialize CodeQL
35-
uses: github/codeql-action/init@v3.25.10
35+
uses: github/codeql-action/init@v3.28.1
3636
with:
3737
languages: ${{ matrix.language }}
3838
config-file: ./.github/codeql-config.yml
3939

4040
- name: Perform CodeQL Analysis
41-
uses: github/codeql-action/analyze@v3.25.10
41+
uses: github/codeql-action/analyze@v3.28.1

‎.github/workflows/core-tests.yml

+12-15
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,13 @@ permissions:
2020
contents: read
2121

2222
env:
23-
LOCAL_PHP: "8.0-fpm"
23+
LOCAL_PHP: "8.2-fpm"
24+
LOCAL_PHP_XDEBUG: "false"
25+
LOCAL_PHP_XDEBUG_MODE: "develop,debug"
2426
LOCAL_DB_TYPE: "mysql"
25-
LOCAL_DB_VERSION: "8.0"
27+
LOCAL_DB_VERSION: "8.3"
2628
LOCAL_PHP_MEMCACHED: "true"
29+
LOCAL_WP_TESTS_DOMAIN: "example.org"
2730
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: "true"
2831

2932
jobs:
@@ -42,25 +45,26 @@ jobs:
4245
echo "PHP_FPM_GID=$(id -g)" >> "${GITHUB_ENV}"
4346
4447
- name: Checkout WordPress
45-
uses: actions/checkout@v4.1.7
48+
uses: actions/checkout@v4.2.2
4649
with:
4750
repository: wordpress/wordpress-develop
4851
path: wordpress
4952
ref: ${{ steps.version.outputs.latest }}
5053

5154
- name: Check out source code
52-
uses: actions/checkout@v4.1.7
55+
uses: actions/checkout@v4.2.2
5356
with:
5457
submodules: recursive
5558
path: wordpress/src/wp-content/mu-plugins
5659

5760
- name: Tweaks
5861
run: |
5962
echo "define( 'VIP_JETPACK_SKIP_LOAD', 'true' );" >> "wordpress/src/wp-content/mu-plugins/000-vip-init.php"
63+
cp wordpress/.env.example wordpress/.env
6064
echo "GITHUB_EVENT_NAME=pull_request" >> "wordpress/.env"
6165
6266
- name: Set up Node.js
63-
uses: actions/setup-node@v4.0.2
67+
uses: actions/setup-node@v4.1.0
6468
with:
6569
node-version-file: 'wordpress/.nvmrc'
6670
cache: npm
@@ -72,17 +76,10 @@ jobs:
7276
php-version: 8.0
7377
coverage: none
7478

75-
# - name: Install Composer dependencies
76-
# uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0
77-
# with:
78-
# working-directory: wordpress
7979
- name: Install Composer dependencies
80-
run: composer install -n
81-
working-directory: wordpress
82-
83-
# - name: Downgrade PHPUnit
84-
# run: composer require --dev -n phpunit/phpunit:^9
85-
# working-directory: wordpress
80+
uses: ramsey/[email protected]
81+
with:
82+
working-directory: wordpress
8683

8784
- name: Install npm dependencies
8885
run: npm ci

‎.github/workflows/coverage-develop.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
MYSQL_DATABASE: wordpress_test
3737
steps:
3838
- name: Check out source code
39-
uses: actions/checkout@v4.1.7
39+
uses: actions/checkout@v4.2.2
4040
with:
4141
submodules: recursive
4242

‎.github/workflows/dependency-review.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
github.com:443
2323
2424
- name: Check out the source code
25-
uses: actions/checkout@v4.1.7
25+
uses: actions/checkout@v4.2.2
2626

2727
- name: Review dependencies
28-
uses: actions/dependency-review-action@v4.3.3
28+
uses: actions/dependency-review-action@v4.5.0

‎.github/workflows/deploy.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ jobs:
2222
contents: write
2323
steps:
2424
- name: Check out the source code
25-
uses: actions/checkout@v4.1.7
25+
uses: actions/checkout@v4.2.2
2626
with:
2727
submodules: recursive
2828
path: ${{ env.SOURCE_REPO_PATH }}
2929

3030
- name: Check out Automattic/vip-go-mu-plugins-ext
31-
uses: actions/checkout@v4.1.7
31+
uses: actions/checkout@v4.2.2
3232
with:
3333
repository: Automattic/vip-go-mu-plugins-ext
3434
path: ${{ env.EXT_REPO_PATH }}
3535

3636
- name: Check out Automattic/vip-go-mu-plugins-built
37-
uses: actions/checkout@v4.1.7
37+
uses: actions/checkout@v4.2.2
3838
with:
3939
repository: Automattic/vip-go-mu-plugins-built
4040
path: ${{ env.TARGET_REPO_PATH }}

‎.github/workflows/e2e.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
playwright.azureedge.net:443
6161
production.cloudflare.docker.com:443
6262
public-api.wordpress.com:443
63+
raw.githubusercontent.com:443
6364
registry-1.docker.io:443
6465
registry.npmjs.org:443
6566
s.w.org:443
@@ -68,15 +69,15 @@ jobs:
6869
wordpress.org:443
6970

7071
- name: Check out repository code
71-
uses: actions/checkout@v4.1.7
72+
uses: actions/checkout@v4.2.2
7273
with:
7374
submodules: true
7475

7576
- name: Prepare source code
7677
uses: ./.github/actions/prepare-source
7778

7879
- name: Setup Node
79-
uses: actions/setup-node@v4.0.2
80+
uses: actions/setup-node@v4.1.0
8081
with:
8182
node-version: 'lts/*'
8283
cache: npm
@@ -131,10 +132,10 @@ jobs:
131132
egress-policy: audit
132133

133134
- name: Check out repository code
134-
uses: actions/checkout@v4.1.7
135+
uses: actions/checkout@v4.2.2
135136

136137
- name: Setup Node
137-
uses: actions/setup-node@v4.0.2
138+
uses: actions/setup-node@v4.1.0
138139
with:
139140
node-version: 'lts/*'
140141
cache: npm

‎.github/workflows/lint.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Check out source code
28-
uses: actions/checkout@v4.1.7
28+
uses: actions/checkout@v4.2.2
2929

3030
- name: Set up PHP
3131
uses: shivammathur/[email protected]
@@ -35,7 +35,7 @@ jobs:
3535
fail-fast: 'true'
3636

3737
- name: Setup Node
38-
uses: actions/setup-node@v4.0.2
38+
uses: actions/setup-node@v4.1.0
3939
with:
4040
node-version: 'lts/*'
4141
cache: npm
@@ -51,10 +51,10 @@ jobs:
5151
runs-on: ubuntu-latest
5252
steps:
5353
- name: Check out source code
54-
uses: actions/checkout@v4.1.7
54+
uses: actions/checkout@v4.2.2
5555

5656
- name: Setup Node
57-
uses: actions/setup-node@v4.0.2
57+
uses: actions/setup-node@v4.1.0
5858
with:
5959
node-version: 'lts/*'
6060
cache: npm

‎.github/workflows/parsely.yml

+3-11
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,12 @@ jobs:
2323
matrix:
2424
config:
2525
# Oldest version of the parsely plugin
26-
- { wp: latest, parsely: '3.5', mode: 'filter_enabled', php: '8.1' }
27-
- { wp: latest, parsely: '3.5', mode: 'filter_disabled', php: '8.1' }
28-
- { wp: latest, parsely: '3.5', mode: 'option_enabled', php: '8.1' }
29-
- { wp: latest, parsely: '3.5', mode: 'option_disabled', php: '8.1' }
30-
- { wp: latest, parsely: '3.5', mode: 'filter_and_option_enabled', php: '8.1' }
31-
- { wp: latest, parsely: '3.5', mode: 'filter_and_option_disabled', php: '8.1' }
26+
- { wp: latest, parsely: '3.15', mode: 'filter_enabled', php: '8.1' }
27+
- { wp: latest, parsely: '3.15', mode: 'filter_disabled', php: '8.1' }
3228

3329
# Latest version of the parsely plugin
3430
- { wp: latest, mode: 'filter_enabled', php: '8.1' }
3531
- { wp: latest, mode: 'filter_disabled', php: '8.1' }
36-
- { wp: latest, mode: 'option_enabled', php: '8.1' }
37-
- { wp: latest, mode: 'option_disabled', php: '8.1' }
38-
- { wp: latest, mode: 'filter_and_option_enabled', php: '8.1' }
39-
- { wp: latest, mode: 'filter_and_option_disabled', php: '8.1' }
4032
services:
4133
mysql:
4234
image: mysql:8
@@ -50,7 +42,7 @@ jobs:
5042
MYSQL_DATABASE: wordpress_test
5143
steps:
5244
- name: Check out source code
53-
uses: actions/checkout@v4.1.7
45+
uses: actions/checkout@v4.2.2
5446
with:
5547
submodules: recursive
5648

‎.github/workflows/search-dev-tools.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222
contents: write
2323
steps:
2424
- name: Check out source code
25-
uses: actions/checkout@v4.1.7
25+
uses: actions/checkout@v4.2.2
2626
with:
2727
token: ${{ secrets.WPCOM_VIP_BOT_TOKEN }}
2828

2929
- name: Setup Node
30-
uses: actions/setup-node@v4.0.2
30+
uses: actions/setup-node@v4.1.0
3131
with:
3232
node-version: 'lts/*'
3333
cache: npm

‎.github/workflows/search-e2e.yml

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Enterprise Search e2e tests
22
env:
3-
NODE_VERSION: "16"
3+
NODE_VERSION: "20"
44

55
on:
66
pull_request:
@@ -30,15 +30,15 @@ jobs:
3030

3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@v4.1.7
33+
uses: actions/checkout@v4.2.2
3434
with:
3535
submodules: recursive
3636

3737
- name: Prepare source code
3838
uses: ./.github/actions/prepare-source
3939

4040
- name: "Install node v${{ env.NODE_VERSION }}"
41-
uses: actions/setup-node@v4.0.2
41+
uses: actions/setup-node@v4.1.0
4242
with:
4343
node-version: ${{ env.NODE_VERSION }}
4444
cache: npm
@@ -69,7 +69,11 @@ jobs:
6969
${{ github.workspace }}/tests/cypress/videos/
7070
${{ github.workspace }}/tests/cypress/logs/
7171
${{ github.workspace }}/cypress/results/
72+
${{ github.workspace }}/tests/search/e2e/screenshots/
73+
${{ github.workspace }}/tests/search/e2e/videos/
74+
${{ github.workspace }}/tests/search/e2e/logs/
7275
7376
- name: Stop Elasticsearch
7477
if: always()
75-
run: cd bin/search/es-docker/ && docker-compose down
78+
run: docker compose down
79+
working-directory: bin/search/es-docker

0 commit comments

Comments
 (0)