Skip to content

Commit 366ad4d

Browse files
desrosjdesrosj
committed
Build/Test Tools: Make use of new reusable workflows.
This updates the 6.4 branch to utilize the new reusable workflows in trunk introduced in [58165]. This also includes backports for a some additional improvements and bug fixes that are necessary for the local development environment to continue working long term: - Migrating to Docker Compose V2 (#60901). - Removing the `version` property from `docker-compose.yml` (#59416). - Improvements to how artifacts and comments for Playground testing are generated. - Removing SVN related commands causing failures (#61216). - Updating the `actions/github-scripts` action to the latest version. Merges [57918], [58157], [57124], [57125], [57249] to the 6.4 branch. Props johnbillion, joemcgill, swissspidy, thelovekesh, narenin, mukesh27, JeffPaul, peterwilsoncc, zieladam, ockham, SergeyBiryukov, jorbin. Fixes #61216. See #60901, #61101, #59416, #59805, #61213. git-svn-id: https://develop.svn.wordpress.org/branches/6.4@58276 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 451db80 commit 366ad4d

File tree

14 files changed

+160
-1048
lines changed

14 files changed

+160
-1048
lines changed

‎.github/workflows/build.yml‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎.github/workflows/coding-standards.yml‎

Lines changed: 3 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -46,132 +46,20 @@ permissions: {}
4646

4747
jobs:
4848
# Runs PHP coding standards checks.
49-
#
50-
# Violations are reported inline with annotations.
51-
#
52-
# Performs the following steps:
53-
# - Checks out the repository.
54-
# - Sets up PHP.
55-
# - Configures caching for PHPCS scans.
56-
# - Installs Composer dependencies.
57-
# - Make Composer packages available globally.
58-
# - Runs PHPCS on the full codebase with warnings suppressed.
59-
# - Generate a report for displaying issues as pull request annotations.
60-
# - Runs PHPCS on the `tests` directory without warnings suppressed.
61-
# - Generate a report for displaying `test` directory issues as pull request annotations.
62-
# - Ensures version-controlled files are not modified or deleted.
6349
phpcs:
6450
name: PHP coding standards
65-
runs-on: ubuntu-latest
51+
uses: WordPress/wordpress-develop/.github/workflows/reusable-coding-standards-php.yml@trunk
6652
permissions:
6753
contents: read
68-
timeout-minutes: 20
6954
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
7055

71-
steps:
72-
- name: Checkout repository
73-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
74-
with:
75-
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
76-
77-
- name: Set up PHP
78-
uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2.25.4
79-
with:
80-
php-version: 'latest'
81-
coverage: none
82-
tools: cs2pr
83-
84-
# This date is used to ensure that the PHPCS cache is cleared at least once every week.
85-
# http://man7.org/linux/man-pages/man1/date.1.html
86-
- name: "Get last Monday's date"
87-
id: get-date
88-
run: echo "date=$(/bin/date -u --date='last Mon' "+%F")" >> $GITHUB_OUTPUT
89-
90-
- name: Cache PHPCS scan cache
91-
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
92-
with:
93-
path: |
94-
.cache/phpcs-src.json
95-
.cache/phpcs-tests.json
96-
key: ${{ runner.os }}-date-${{ steps.get-date.outputs.date }}-phpcs-cache-${{ hashFiles('**/composer.json', 'phpcs.xml.dist') }}
97-
98-
# Since Composer dependencies are installed using `composer update` and no lock file is in version control,
99-
# passing a custom cache suffix ensures that the cache is flushed at least once per week.
100-
- name: Install Composer dependencies
101-
uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0
102-
with:
103-
custom-cache-suffix: ${{ steps.get-date.outputs.date }}
104-
105-
- name: Make Composer packages available globally
106-
run: echo "${PWD}/vendor/bin" >> $GITHUB_PATH
107-
108-
- name: Run PHPCS on all Core files
109-
id: phpcs-core
110-
run: phpcs -n --report-full --cache=./.cache/phpcs-src.json --report-checkstyle=./.cache/phpcs-report.xml
111-
112-
- name: Show PHPCS results in PR
113-
if: ${{ always() && steps.phpcs-core.outcome == 'failure' }}
114-
run: cs2pr ./.cache/phpcs-report.xml
115-
116-
- name: Check test suite files for warnings
117-
id: phpcs-tests
118-
run: phpcs tests --report-full --cache=./.cache/phpcs-tests.json --report-checkstyle=./.cache/phpcs-tests-report.xml
119-
120-
- name: Show test suite scan results in PR
121-
if: ${{ always() && steps.phpcs-tests.outcome == 'failure' }}
122-
run: cs2pr ./.cache/phpcs-tests-report.xml
123-
124-
- name: Ensure version-controlled files are not modified during the tests
125-
run: git diff --exit-code
126-
12756
# Runs the JavaScript coding standards checks.
128-
#
129-
# JSHint violations are not currently reported inline with annotations.
130-
#
131-
# Performs the following steps:
132-
# - Checks out the repository.
133-
# - Sets up Node.js.
134-
# - Logs debug information about the GitHub Action runner.
135-
# - Installs npm dependencies.
136-
# - Run the WordPress JSHint checks.
137-
# - Ensures version-controlled files are not modified or deleted.
13857
jshint:
13958
name: JavaScript coding standards
140-
runs-on: ubuntu-latest
59+
uses: WordPress/wordpress-develop/.github/workflows/reusable-coding-standards-javascript.yml@trunk
14160
permissions:
14261
contents: read
143-
timeout-minutes: 20
14462
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
145-
env:
146-
PUPPETEER_SKIP_DOWNLOAD: ${{ true }}
147-
148-
steps:
149-
- name: Checkout repository
150-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
151-
with:
152-
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
153-
154-
- name: Set up Node.js
155-
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
156-
with:
157-
node-version-file: '.nvmrc'
158-
cache: npm
159-
160-
- name: Log debug information
161-
run: |
162-
npm --version
163-
node --version
164-
git --version
165-
svn --version
166-
167-
- name: Install npm Dependencies
168-
run: npm ci
169-
170-
- name: Run JSHint
171-
run: npm run grunt jshint
172-
173-
- name: Ensure version-controlled files are not modified or deleted
174-
run: git diff --exit-code
17563

17664
slack-notifications:
17765
name: Slack Notifications
@@ -207,7 +95,7 @@ jobs:
20795
20896
steps:
20997
- name: Dispatch workflow run
210-
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
98+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
21199
with:
212100
retries: 2
213101
retry-exempt-status-codes: 418

‎.github/workflows/end-to-end-tests.yml‎

Lines changed: 5 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -36,107 +36,18 @@ env:
3636

3737
jobs:
3838
# Runs the end-to-end test suite.
39-
#
40-
# Performs the following steps:
41-
# - Sets environment variables.
42-
# - Checks out the repository.
43-
# - Sets up Node.js.
44-
# - Logs debug information about the GitHub Action runner.
45-
# - Installs npm dependencies.
46-
# - Install Playwright browsers.
47-
# - Builds WordPress to run from the `build` directory.
48-
# - Starts the WordPress Docker container.
49-
# - Logs the running Docker containers.
50-
# - Logs Docker debug information (about both the Docker installation within the runner and the WordPress container).
51-
# - Install WordPress within the Docker container.
52-
# - Install Gutenberg.
53-
# - Run the E2E tests.
54-
# - Ensures version-controlled files are not modified or deleted.
5539
e2e-tests:
56-
name: E2E Tests with SCRIPT_DEBUG ${{ matrix.LOCAL_SCRIPT_DEBUG && 'enabled' || 'disabled' }}
57-
runs-on: ubuntu-latest
40+
name: Test with SCRIPT_DEBUG ${{ matrix.LOCAL_SCRIPT_DEBUG && 'enabled' || 'disabled' }}
41+
uses: WordPress/wordpress-develop/.github/workflows/reusable-end-to-end-tests.yml@trunk
5842
permissions:
5943
contents: read
60-
timeout-minutes: 20
6144
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
6245
strategy:
6346
fail-fast: false
6447
matrix:
6548
LOCAL_SCRIPT_DEBUG: [ true, false ]
66-
67-
steps:
68-
- name: Configure environment variables
69-
run: |
70-
echo "PHP_FPM_UID=$(id -u)" >> $GITHUB_ENV
71-
echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
72-
73-
- name: Checkout repository
74-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
75-
with:
76-
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
77-
78-
- name: Set up Node.js
79-
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
80-
with:
81-
node-version-file: '.nvmrc'
82-
cache: npm
83-
84-
- name: Log debug information
85-
run: |
86-
npm --version
87-
node --version
88-
curl --version
89-
git --version
90-
svn --version
91-
locale -a
92-
93-
- name: Install npm Dependencies
94-
run: npm ci
95-
96-
- name: Install Playwright browsers
97-
run: npx playwright install --with-deps
98-
99-
- name: Build WordPress
100-
run: npm run build
101-
102-
- name: Start Docker environment
103-
run: |
104-
npm run env:start
105-
106-
- name: Log running Docker containers
107-
run: docker ps -a
108-
109-
- name: Docker debug information
110-
run: |
111-
docker -v
112-
docker-compose -v
113-
docker-compose run --rm mysql mysql --version
114-
docker-compose run --rm php php --version
115-
docker-compose run --rm php php -m
116-
docker-compose run --rm php php -i
117-
docker-compose run --rm php locale -a
118-
119-
- name: Install WordPress
120-
env:
121-
LOCAL_SCRIPT_DEBUG: ${{ matrix.LOCAL_SCRIPT_DEBUG }}
122-
run: npm run env:install
123-
124-
- name: Install Gutenberg
125-
run: npm run env:cli -- plugin install gutenberg --path=/var/www/${{ env.LOCAL_DIR }}
126-
127-
- name: Run E2E tests
128-
run: npm run test:e2e
129-
130-
- name: Archive debug artifacts (screenshots, HTML snapshots)
131-
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
132-
if: always()
133-
with:
134-
name: failures-artifacts
135-
path: artifacts
136-
if-no-files-found: ignore
137-
138-
- name: Ensure version-controlled files are not modified or deleted
139-
run: git diff --exit-code
49+
with:
50+
LOCAL_SCRIPT_DEBUG: ${{ matrix.LOCAL_SCRIPT_DEBUG }}
14051

14152
slack-notifications:
14253
name: Slack Notifications
@@ -171,7 +82,7 @@ jobs:
17182
)
17283
steps:
17384
- name: Dispatch workflow run
174-
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
85+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
17586
with:
17687
retries: 2
17788
retry-exempt-status-codes: 418

‎.github/workflows/javascript-tests.yml‎

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -44,50 +44,13 @@ permissions: {}
4444

4545
jobs:
4646
# Runs the QUnit tests for WordPress.
47-
#
48-
# Performs the following steps:
49-
# - Checks out the repository.
50-
# - Sets up Node.js.
51-
# - Logs debug information about the GitHub Action runner.
52-
# - Installs npm dependencies.
53-
# - Run the WordPress QUnit tests.
54-
# - Ensures version-controlled files are not modified or deleted.
5547
test-js:
5648
name: QUnit Tests
57-
runs-on: ubuntu-latest
49+
uses: WordPress/wordpress-develop/.github/workflows/reusable-javascript-tests.yml@trunk
5850
permissions:
5951
contents: read
60-
timeout-minutes: 20
6152
if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
6253

63-
steps:
64-
- name: Checkout repository
65-
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
66-
with:
67-
show-progress: ${{ runner.debug == '1' && 'true' || 'false' }}
68-
69-
- name: Set up Node.js
70-
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
71-
with:
72-
node-version-file: '.nvmrc'
73-
cache: npm
74-
75-
- name: Log debug information
76-
run: |
77-
npm --version
78-
node --version
79-
git --version
80-
svn --version
81-
82-
- name: Install npm Dependencies
83-
run: npm ci
84-
85-
- name: Run QUnit tests
86-
run: npm run grunt qunit:compiled
87-
88-
- name: Ensure version-controlled files are not modified or deleted
89-
run: git diff --exit-code
90-
9154
slack-notifications:
9255
name: Slack Notifications
9356
uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
@@ -122,7 +85,7 @@ jobs:
12285
12386
steps:
12487
- name: Dispatch workflow run
125-
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
88+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
12689
with:
12790
retries: 2
12891
retry-exempt-status-codes: 418

0 commit comments

Comments
 (0)