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

Staging release v20241119.1 #6000

Merged
merged 18 commits into from
Nov 19, 2024
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
b93b8e3
ci: fix WP Core tests (#5986)
sjinks Nov 12, 2024
5a6d8f5
chore(deps): Bump react-select from 5.8.1 to 5.8.3 (#5982)
dependabot[bot] Nov 12, 2024
4b89952
chore(deps): Bump github/codeql-action from 3.27.0 to 3.27.1 (#5981)
dependabot[bot] Nov 12, 2024
e1a9b6f
chore(deps-dev): Bump eslint-plugin-playwright in /__tests__/e2e (#5980)
dependabot[bot] Nov 13, 2024
a5b231c
chore(deps-dev): Bump @types/node in /__tests__/e2e (#5979)
dependabot[bot] Nov 13, 2024
6c1bdd8
chore(deps): Bump sjinks/setup-wordpress-test-library (#5987)
dependabot[bot] Nov 13, 2024
8fb8751
chore(deps): Bump actions/dependency-review-action from 4.3.4 to 4.4.…
dependabot[bot] Nov 13, 2024
f1339bb
chore(deps): Bump actions/checkout in /.github/actions/prepare-source…
dependabot[bot] Nov 13, 2024
9839a61
chore(deps-dev): Bump @babel/plugin-syntax-decorators in /__tests__/e…
dependabot[bot] Nov 13, 2024
3b90e59
chore(deps-dev): Bump @playwright/test in /__tests__/e2e (#5957)
dependabot[bot] Nov 13, 2024
6ac5d1f
chore(deps): Bump cookie and express in /search/search-dev-tools (#5977)
dependabot[bot] Nov 13, 2024
61cb023
ci: use preconfigured WP image if available (#5989)
sjinks Nov 13, 2024
05a72c5
Refactor Tracks events props to util functions (#5966)
mehmoodak Nov 15, 2024
298955b
chore(deps-dev): Bump johnpbloch/wordpress-core from 6.6.2 to 6.7.0 (…
dependabot[bot] Nov 19, 2024
0b61d8c
chore(deps-dev): Bump wp-phpunit/wp-phpunit from 6.6.2 to 6.7.0 (#5996)
dependabot[bot] Nov 19, 2024
998f9f6
chore(deps): Bump softprops/action-gh-release from 2.0.9 to 2.1.0 (#5…
dependabot[bot] Nov 19, 2024
eb9922a
chore(deps): Bump github/codeql-action from 3.27.1 to 3.27.4 (#5993)
dependabot[bot] Nov 19, 2024
d566621
chore(deps): Bump codecov/codecov-action (#5997)
dependabot[bot] Nov 19, 2024
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
2 changes: 1 addition & 1 deletion .github/actions/prepare-source/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ runs:
using: composite
steps:
- name: Check out mu-plugins-ext
uses: actions/[email protected].1
uses: actions/[email protected].2
with:
repository: 'Automattic/vip-go-mu-plugins-ext'
path: 'vip-go-mu-plugins-ext'
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/run-wp-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ runs:
uses: ramsey/[email protected]

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

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

- name: Upload coverage report
uses: codecov/codecov-action@v4.6.0
uses: codecov/codecov-action@v5.0.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.0.9
- uses: softprops/action-gh-release@v2.1.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/[email protected].0
uses: github/codeql-action/[email protected].4
with:
languages: ${{ matrix.language }}
config-file: ./.github/codeql-config.yml

- name: Perform CodeQL Analysis
uses: github/codeql-action/[email protected].0
uses: github/codeql-action/[email protected].4
21 changes: 9 additions & 12 deletions .github/workflows/core-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,13 @@ permissions:
contents: read

env:
LOCAL_PHP: "8.0-fpm"
LOCAL_PHP: "8.2-fpm"
LOCAL_PHP_XDEBUG: "false"
LOCAL_PHP_XDEBUG_MODE: "develop,debug"
LOCAL_DB_TYPE: "mysql"
LOCAL_DB_VERSION: "8.0"
LOCAL_DB_VERSION: "8.3"
LOCAL_PHP_MEMCACHED: "true"
LOCAL_WP_TESTS_DOMAIN: "example.org"
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: "true"

jobs:
Expand Down Expand Up @@ -57,6 +60,7 @@ jobs:
- name: Tweaks
run: |
echo "define( 'VIP_JETPACK_SKIP_LOAD', 'true' );" >> "wordpress/src/wp-content/mu-plugins/000-vip-init.php"
cp wordpress/.env.example wordpress/.env
echo "GITHUB_EVENT_NAME=pull_request" >> "wordpress/.env"

- name: Set up Node.js
Expand All @@ -72,17 +76,10 @@ jobs:
php-version: 8.0
coverage: none

# - name: Install Composer dependencies
# uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0
# with:
# working-directory: wordpress
- name: Install Composer dependencies
run: composer install -n
working-directory: wordpress

# - name: Downgrade PHPUnit
# run: composer require --dev -n phpunit/phpunit:^9
# working-directory: wordpress
uses: ramsey/[email protected]
with:
working-directory: wordpress

- name: Install npm dependencies
run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ jobs:
uses: actions/[email protected]

- name: Review dependencies
uses: actions/dependency-review-action@v4.3.4
uses: actions/dependency-review-action@v4.4.0
1 change: 1 addition & 0 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ jobs:
playwright.azureedge.net:443
production.cloudflare.docker.com:443
public-api.wordpress.com:443
raw.githubusercontent.com:443
registry-1.docker.io:443
registry.npmjs.org:443
s.w.org:443
Expand Down
1 change: 1 addition & 0 deletions 000-vip-init.php
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@
__DIR__ . '/telemetry/tracks/class-tracks-event-dto.php',
__DIR__ . '/telemetry/tracks/class-tracks-event.php',
__DIR__ . '/telemetry/tracks/class-tracks-client.php',
__DIR__ . '/telemetry/tracks/tracks-utils.php',
];

// If there is a missing file, the loop will break and the telemetry files will not be loaded at all
Expand Down
20 changes: 16 additions & 4 deletions __tests__/e2e/bin/setup-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,26 @@ if [ -z "${version}" ]; then
version=${WORDPRESS_VERSION:-latest}
fi

if [ "${version}" = "latest" ]; then
WPVER="$(wget https://github.com/Automattic/vip-container-images/raw/refs/heads/master/wordpress/versions.json -O - | jq -r '[.[] | select(.prerelease == false)] | max_by(.tag) | .tag')"
else
WPVER="$(wget https://github.com/Automattic/vip-container-images/raw/refs/heads/master/wordpress/versions.json -O - | jq -r --arg ref_value "${version}" '.[] | select(.ref == $ref_value) | .tag')"
fi

if [ -z "${WPVER}" ]; then
WPVER=trunk
fi

# Destroy existing test site
vip dev-env destroy --slug=e2e-test-site || true

# Create and run test site
vip --slug=e2e-test-site dev-env create --title="E2E Testing site" --mu-plugins="${pluginPath}" --mailpit false --wordpress=trunk --multisite=false --app-code="${clientCodePath}" --php 8.2 --xdebug false --phpmyadmin false --elasticsearch true < /dev/null
vip --slug=e2e-test-site dev-env create --title="E2E Testing site" --mu-plugins="${pluginPath}" --mailpit false --wordpress="${WPVER}" --multisite=false --app-code="${clientCodePath}" --php 8.2 --xdebug false --phpmyadmin false --elasticsearch true < /dev/null
vip dev-env start --slug e2e-test-site --skip-wp-versions-check
vip dev-env shell --root --slug e2e-test-site -- chown -R www-data:www-data /wp
vip dev-env shell --root --slug e2e-test-site -- chown -R www-data:www-data /wp/wp-content/plugins
vip dev-env exec --slug e2e-test-site --quiet -- wp plugin install --activate classic-editor
vip dev-env exec --slug e2e-test-site --quiet -- wp core update --force --version="${version}"
vip dev-env exec --slug e2e-test-site --quiet -- wp core update-db
if [ "${WPVER}" = 'trunk' ]; then
vip dev-env exec --slug e2e-test-site --quiet -- wp core update --force --version="${version}"
vip dev-env exec --slug e2e-test-site --quiet -- wp core update-db
fi
vip dev-env exec --slug e2e-test-site --quiet -- wp rewrite structure '/%postname%/'
60 changes: 27 additions & 33 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: 1 addition & 1 deletion __tests__/e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"asana-phrase": "^0.0.8",
"eslint": "^8.51.0",
"eslint-plugin-deprecation": "^3.0.0",
"eslint-plugin-playwright": "^1.0.1",
"eslint-plugin-playwright": "^2.0.1",
"typescript": "^5.2.2"
}
}
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"erusev/parsedown": "1.7.4",
"dms/phpunit-arraysubset-asserts": "0.5.0",
"yoast/phpunit-polyfills": "3.0.0",
"johnpbloch/wordpress-core": "6.6.2",
"wp-phpunit/wp-phpunit": "6.6.2",
"johnpbloch/wordpress-core": "6.7.0",
"wp-phpunit/wp-phpunit": "6.7.0",
"wp-cli/wp-cli": "2.11.0"
},
"config": {
Expand Down
24 changes: 12 additions & 12 deletions composer.lock

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

6 changes: 3 additions & 3 deletions package-lock.json

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

Loading
Loading