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

Cut release 0.9.9 from develop #728

Merged
merged 90 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
b3c1a76
attempting to set min php v to 7.4
ingeniumed May 20, 2024
9a6ce3d
Tweaking the php version for js/e1e tests
ingeniumed May 20, 2024
e104f33
Tweaking the fail fast
ingeniumed May 20, 2024
688d5e7
Cancel prev builds
ingeniumed May 20, 2024
86a2617
Tweak packages for 7.4
ingeniumed May 20, 2024
d80ce48
Attempting to resolve node build issues
ingeniumed May 20, 2024
b223b40
Fix node-sass not running properly
ingeniumed May 20, 2024
b2dc9a1
reverse the node-sass upgrade
ingeniumed May 20, 2024
62366f0
Fix the formatting
ingeniumed May 20, 2024
5b1da2b
Forcing a new build
ingeniumed May 20, 2024
d4d0ad1
Add .nvmrc for current version of 14, regenerate package-lock.json
alecgeatches May 20, 2024
e0a602e
Remove eslines from eslint pipeline, directly output from eslint
alecgeatches May 20, 2024
0199a8f
Update addCategoryToPost to type into the correct input location
alecgeatches May 20, 2024
e5becfc
Temporarily put linting step last
alecgeatches May 20, 2024
f9c1d30
Add interactive e2e test script
alecgeatches May 20, 2024
5b58905
Simplify page reload requirements, seems to work more consistently
alecgeatches May 20, 2024
ed0f724
Fix XPath selector for `trashExistingPosts()` utility function
alecgeatches May 20, 2024
062faee
Fix selectors for `schedulePost()` e2e utility function
alecgeatches May 20, 2024
ea5fe8a
Directly interact with future publish date inputs instead of changing…
alecgeatches May 20, 2024
6c83058
Upgrade the eslint package, lint all the files, add rules to be ignored
ingeniumed May 21, 2024
f825600
Tweak the packages installed
ingeniumed May 21, 2024
35953ad
Add back the empty line
ingeniumed May 21, 2024
59ec23d
Merge branch 'fix/gh-actions' of github.com:Automattic/Edit-Flow into…
ingeniumed May 21, 2024
719a70c
Update build output
ingeniumed May 21, 2024
9df1b9e
Do the linting first in the workflow
ingeniumed May 21, 2024
98999f2
Merge pull request #722 from Automattic/fix/gh-actions
alecgeatches May 21, 2024
6dbfc2b
Scroll to categories button before clicking, temporarily add addition…
alecgeatches May 21, 2024
1cd8c77
Wait for categories button before using it
alecgeatches May 21, 2024
95ee96b
Ignore unrelated Chromium error in logs
alecgeatches May 21, 2024
b276f5a
Add screenshot on failure
alecgeatches May 21, 2024
d44f5dd
Use selectors instead of xpath for clicking elements
alecgeatches May 21, 2024
ebbd4de
Try even more e2e test runs
alecgeatches May 21, 2024
cc828c5
Remove temporary code to run e2e tests more than once
alecgeatches May 21, 2024
87d4da1
Restore the non-fixed version of the common modules and ignore them f…
ingeniumed May 21, 2024
b87cfe9
Fix the lint command
ingeniumed May 21, 2024
a884b37
Merge pull request #723 from Automattic/fix/lint-step
ingeniumed May 21, 2024
6046380
Upgrade the PHPUnit code and set the min WP version to 5.9
ingeniumed May 22, 2024
a1fb77f
Change integration and integration-ms tests to run on wp-env
alecgeatches May 22, 2024
9df5d58
Update test files, bootstrap file
alecgeatches May 22, 2024
b8646fb
Update wp-env and remove legacy configuration
alecgeatches May 22, 2024
fcef9c6
Update tests to match PHPUnit 9 base classes
alecgeatches May 22, 2024
643be6e
Update GitHub Actions workflow to use wp-env
alecgeatches May 22, 2024
9720ed8
Fix capitalization for plugin file
alecgeatches May 22, 2024
b04fe45
Minor tweaks for phpcs diff report
alecgeatches May 22, 2024
de8631f
Fix formatting in bootstrap file
alecgeatches May 22, 2024
7351507
Fix "latest" composer install in test matrix
alecgeatches May 22, 2024
3f057b0
Use correct WP version in tests, remove "latest" matrix run
alecgeatches May 22, 2024
c2a4b80
Remove unused behat test
alecgeatches May 22, 2024
9c0b921
Use correct WordPress reference
alecgeatches May 22, 2024
5b535a6
Use 'master' instead of 'trunk' for root reference
alecgeatches May 22, 2024
f217cbb
Alias 'master' to 'latest' in test name
alecgeatches May 22, 2024
e4d4d48
Add comment explaining alias
alecgeatches May 22, 2024
4f10d99
Remove install-wp-tests.sh script
alecgeatches May 22, 2024
e1ee3a2
Merge pull request #724 from Automattic/add/lint-step-php
alecgeatches May 22, 2024
090f168
Attempting to upgrade the JS packages
ingeniumed May 23, 2024
727fd66
Mark node as version 20
alecgeatches May 23, 2024
90cb8d1
Replace 'extract-text-webtack-plugin' with 'mini-css-extract-plugin'
alecgeatches May 23, 2024
f300d0b
Remove unused 'node-sass' package. Add node 20 package-lock.json file
alecgeatches May 23, 2024
6beb28e
Update webpack configuration to allow build
alecgeatches May 23, 2024
6aa66dd
Add changed build files
alecgeatches May 23, 2024
54b995a
Fix 'matchSorter' import from webpack warning
alecgeatches May 23, 2024
3b4f44a
Upgrade tests to use node 20
alecgeatches May 23, 2024
5e3bf1d
Update GitHub Action step name for node 20
alecgeatches May 23, 2024
462b0d4
Downgrade prettier to prior version 2.8.5
alecgeatches May 23, 2024
fb78d41
Fix linting error from deprecated React API
alecgeatches May 23, 2024
eb3540c
Fix jest package breaking change
alecgeatches May 23, 2024
95a39c3
Update the test setup code, and remove the a11xy tests like Gutenberg…
ingeniumed May 24, 2024
15c5c7d
Remove waitFor entirely
ingeniumed May 24, 2024
6702cb0
Update the actions used in the workflows
ingeniumed May 24, 2024
180a951
Tweak the cache path
ingeniumed May 24, 2024
7ea0759
Merge pull request #725 from Automattic/update/js-packages
alecgeatches May 24, 2024
552643d
Bump plugin version to 0.9.9, apply automatic PHP lint changes
alecgeatches May 24, 2024
276a204
Add requirement changes to plugin header
alecgeatches May 24, 2024
579a365
Add README changelog changes
alecgeatches May 24, 2024
7857a31
Fix phpcs errors
alecgeatches May 24, 2024
3e734de
Move PHPCS diff tests action to prior location
alecgeatches May 24, 2024
61a0b3c
Add changelog notes for 0.9.8
alecgeatches May 24, 2024
f041a0d
Revert '@wordpress/e2e-test-utils' version and try a run of 10 tests
alecgeatches May 24, 2024
5ffb31c
Check if categories sidebar is already open in addCategoryToPost()
alecgeatches May 24, 2024
a951e24
Change test utils back to 10.29.0, add `ensureSidebarOpened()`
alecgeatches May 24, 2024
2e91bdf
e2e-test-utils back to 4.16.1, port `ensureSidebarOpened()` from late…
alecgeatches May 24, 2024
8c6193d
Bump the minimim version of php to 8.0
ingeniumed May 28, 2024
0bd10bd
Merge pull request #727 from Automattic/update/php
ingeniumed May 28, 2024
ff38e4c
Merge with develop and fix conflicts
ingeniumed May 28, 2024
977244b
Update to run against 8.0 only
ingeniumed May 28, 2024
bad4872
Revert the entire formatting of the readme.txt
ingeniumed May 28, 2024
75bfa75
Revert readme.txt formatting
ingeniumed May 28, 2024
ca6cf8f
Add new releases
ingeniumed May 28, 2024
3049966
Merge pull request #726 from Automattic/bump/plugin-to-0.9.9
ingeniumed May 28, 2024
a36d498
Update the editflow version in the docs
ingeniumed Jun 3, 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
11 changes: 0 additions & 11 deletions .eslines.json

This file was deleted.

3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
*.build.js
node_modules
vendor
*.php
38 changes: 38 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
require( '@automattic/eslint-plugin-wpvip/init' );

module.exports = {
extends: [ 'plugin:@automattic/wpvip/recommended' ],
root: true,
env: {
jest: true,
},
rules: {
"no-prototype-builtins": 0,
"no-eval": 0,
"complexity": 0,
"camelcase": 0,
"no-undef": 0,
"wpcalypso/import-docblock": 0,
"valid-jsdoc": 0,
"react/prop-types": 0,
"react/react-in-jsx-scope": 0,
"react-hooks/rules-of-hooks": 0,
"no-redeclare": 0,
"no-shadow": 0,
"no-nested-ternary": 0,
"no-var": 0,
"no-unused-vars": 0,
"no-useless-escape": 0,
"prefer-const": 0,
"no-global-assign": 0,
"no-constant-binary-expression": 0,
"valid-typeof": 0,
"eqeqeq": 0,
"radix": 0,
"no-eq-null": 0,
"array-callback-return": 0,
"no-unused-expressions": 0,
"no-alert": 0,
"no-lonely-if": 0,
}
};
27 changes: 0 additions & 27 deletions .github/workflows/behat-test.yml

This file was deleted.

33 changes: 16 additions & 17 deletions .github/workflows/e2e-and-js-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,27 @@ name: E2E and JS tests

on: push

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
runs-on: ubuntu-latest
continue-on-error: false

env:
# Currently these tests are being run for PHP 7.4 only
# TODO: When a new version of wp-env (after 4.0.2) including this https://github.com/WordPress/gutenberg/pull/30651
# is released, we can switch all PHP tests using wp-env
WP_ENV_PHP_VERSION: 7.4

strategy:
fail-fast: false
fail-fast: true

steps:
- name: Checkout code
uses: actions/checkout@master
uses: actions/checkout@v4

- name: Set up NodeJS 14.x
uses: actions/setup-node@v2
- name: Set up NodeJS 20
uses: actions/setup-node@v4
with:
node-version: '14'
node-version: '20'
cache: npm

- name: Build Edit Flow
run: |
Expand All @@ -33,11 +32,11 @@ jobs:
- name: Install WordPress with wp-env
run: npm run wp-env start

- name: Run Lint JS
- name: Run Lint JS
run: npm run lint-js
- name: Run JS tests (Jest)

- name: Run Jest tests
run: npm run test-jest
- name: Run E2E tests
run: npm run test-e2e

- name: Run E2E tests
run: npm run test-e2e
59 changes: 26 additions & 33 deletions .github/workflows/php-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,61 +2,54 @@ name: PHP Tests

on: push

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
name: WP ${{ matrix.wp }} and PHP ${{ matrix.php }}
# Ubuntu-20.x includes MySQL 8.0, which causes `caching_sha2_password` issues with PHP < 7.4
# https://www.php.net/manual/en/mysqli.requirements.php
# TODO: change to ubuntu-latest when we no longer support PHP < 7.4
runs-on: ubuntu-16.04
# Alias 'master' to 'latest'
name: WP ${{ matrix.wp == 'master' && 'latest' || matrix.wp }} and PHP ${{ matrix.php }}
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.allowed_failure }}

strategy:
fail-fast: false
matrix:
php: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4' ]
wp: [ '5.6', '5.7' ]
allowed_failure: [ false ]
include:
# Check lowest supported WP version, with the lowest supported PHP.
- php: '8.0'
wp: '5.6'
allowed_failure: true
- php: '8.0'
wp: '5.7'
allowed_failure: true
wp: '6.0'
allowed_failure: false
# Check latest WP with the highest supported PHP.
- php: 'latest'
wp: 'master'
allowed_failure: false

steps:
- name: Checkout code
uses: actions/checkout@master
uses: actions/checkout@v4

- name: Install wordpress environment
run: npm -g install @wordpress/env

- name: Setup PHP ${{ matrix.php }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
coverage: pcov
# https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions
extensions: curl, dom, exif, fileinfo, hash, json, mbstring, mysqli, libsodium, openssl, pcre, imagick, xml, zip
tools: composer

- name: Install Composer dependencies (PHP < 8.0 )
if: ${{ matrix.php < 8.0 }}
uses: ramsey/composer-install@v1

- name: Install Composer dependencies (PHP >= 8.0)
if: ${{ matrix.php >= 8.0 }}
uses: ramsey/composer-install@v1
- name: Install Composer dependencies
uses: ramsey/composer-install@v3
with:
composer-options: --ignore-platform-reqs

- name: Start MySQL service
run: sudo systemctl start mysql.service
composer-options: --prefer-dist --no-progress

- name: Install WordPress test site
run: bash bin/install-wp-tests.sh wordpress_test root root localhost ${{ matrix.wp }}
- name: Setup wp-env
run: wp-env start
env:
WP_ENV_CORE: WordPress/WordPress#${{ matrix.wp }}

- name: Run PHPCS diff tests
# TODO: remove this condition when a new version of WPCS is released
# @see https://github.com/Automattic/Edit-Flow/issues/638#issuecomment-825511819
if: ${{ matrix.php < 8.0 }}
run: bash bin/phpcs-diff.sh

- name: Run PHPUnit tests (single site)
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@
node_modules
wordpress
vendor

# Test files
.phpunit.result.cache
artifacts/
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20
6 changes: 6 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
node_modules
vendor
*.php
package-lock.json
package.json
*.build.js
1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"@automattic/eslint-plugin-wpvip/prettierrc"
3 changes: 0 additions & 3 deletions .prettierrc.js

This file was deleted.

3 changes: 3 additions & 0 deletions .wp-env.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"plugins": [ "." ]
}
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ For support questions, feedback and ideas, please use the [WordPress.org forums]

## Upgrade Notice

**0.9.9**
Bump minimum PHP supported version to 8.0, WordPress minimum supported version to 6.0.

**0.9.8**
PHP 8.2 compatible with various bug fixes

Expand Down Expand Up @@ -128,6 +131,16 @@ New features, including story budget and editorial metadata, a completely rewrit

## Changelog

**0.9.9 (May 24, 2024)**
* Enhancements: bump lowest supported PHP version to 8.0 and lowest WordPress version to 6.0 (https://github.com/Automattic/Edit-Flow/pull/727)
* Test fix: Update ESLint configuration and format JS files (https://github.com/Automattic/Edit-Flow/pull/723)
* Enhancements: Move JS environment to node 20, upgrade packages (https://github.com/Automattic/Edit-Flow/pull/725)

**0.9.8 (April 10, 2024)**
* Fix WP 5.9 deprecation notice with `who` in `WP_User_Query` (https://github.com/Automattic/Edit-Flow/pull/701)
* Add PHP 8.2 fixes (https://github.com/Automattic/Edit-Flow/pull/700)
* Bump @babel/traverse from 7.1.6 to 7.23.2 (https://github.com/Automattic/Edit-Flow/pull/714)

**0.9.7 (August 26, 2022)**
* Bug fix: Allow scheduled posts to be shifted around on calendar (https://github.com/Automattic/Edit-Flow/pull/614)
* Bug fix: Add back unpublish status, small css tweak for statuses (https://github.com/Automattic/Edit-Flow/pull/613)
Expand Down
13 changes: 0 additions & 13 deletions bin/docker-compose.override.yml.template

This file was deleted.

Loading