Changeset 63162 for trunk

Timestamp:

08/10/2026 05:21:35 PM (5 days ago)

Author:

desrosj

Message:

Build/Test Tools: Miscellaneous imrpovements after [62859].

This applies several small changes to improve on the changes aimed at fetching the built Gutenberg asset zip file once per run:

• Adds some missing step names.
• Converts the gutenberg-artifact workflow input from a string to boolean.
• Removes overly complex job description.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/12935.

Follow up to [62859], [62862].

Props desrosj, irozum.
Fixes #65721.

Location:

trunk/.github/workflows

Files:

• phpunit-tests.yml (modified) (6 diffs)
• reusable-phpunit-tests-v3.yml (modified) (2 diffs)
• test-coverage.yml (modified) (2 diffs)

trunk/.github/workflows/phpunit-tests.yml

@@ -54 +54 @@
 jobs:
   # Downloads and verifies the Gutenberg build once for all PHPUnit jobs.
-  #
-  # This condition is the union of the conditions on the jobs that need it, reduced.
-  # The org matrices require `WordPress/wordpress-develop` or a pull request, and the
-  # fork matrix requires a pull request, so `wordpress-develop` or a pull request
-  # covers every case. Keep it in step with those jobs: a narrower condition orphans
-  # them, because a job that needs a skipped job is skipped too, and a broader one
-  # downloads a build that nothing consumes.
   prepare-gutenberg:
+    name: Prepare Gutenberg Assets
     uses: ./.github/workflows/reusable-prepare-gutenberg.yml
     permissions:
@@ -145 +139 @@
       tests-domain: ${{ matrix.tests-domain }}
       report: ${{ matrix.report || false }}
-      gutenberg-artifact: gutenberg-build
+      gutenberg-artifact: ${{ needs.prepare-gutenberg.result != 'skipped' }}
       gutenberg-sha: ${{ needs.prepare-gutenberg.outputs.gutenberg-sha }}
 
@@ -201 +195 @@
       phpunit-config: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
       report: false
-      gutenberg-artifact: gutenberg-build
+      gutenberg-artifact: ${{ needs.prepare-gutenberg.result != 'skipped' }}
       gutenberg-sha: ${{ needs.prepare-gutenberg.outputs.gutenberg-sha }}
 
@@ -251 +245 @@
       phpunit-config: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
       report: false
-      gutenberg-artifact: gutenberg-build
+      gutenberg-artifact: ${{ needs.prepare-gutenberg.result != 'skipped' }}
       gutenberg-sha: ${{ needs.prepare-gutenberg.outputs.gutenberg-sha }}
 
@@ -286 +280 @@
       db-version: ${{ matrix.db-version }}
       phpunit-test-groups: ${{ matrix.phpunit-test-groups }}
-      gutenberg-artifact: gutenberg-build
+      gutenberg-artifact: ${{ needs.prepare-gutenberg.result != 'skipped' }}
       gutenberg-sha: ${{ needs.prepare-gutenberg.outputs.gutenberg-sha }}
 
@@ -351 +345 @@
       phpunit-config: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
       phpunit-test-groups: ${{ matrix.phpunit-test-groups || '' }}
-      gutenberg-artifact: gutenberg-build
+      gutenberg-artifact: ${{ needs.prepare-gutenberg.result != 'skipped' }}
       gutenberg-sha: ${{ needs.prepare-gutenberg.outputs.gutenberg-sha }}
 

trunk/.github/workflows/reusable-phpunit-tests-v3.yml

@@ -74 +74 @@
         default: false
       gutenberg-artifact:
-        description: 'The name of a same-workflow artifact containing the prepared Gutenberg build. Optional: callers that omit it download Gutenberg per job.'
-        required: false
-        type: string
-        default: ''
+        description: 'Whether the Gutenberg-sourced assets are sourced from zip artifact.'
+        required: false
+        type: boolean
+        default: false
       gutenberg-sha:
         description: 'The immutable Gutenberg source SHA verified by the calling workflow.'
@@ -147 +147 @@
           persist-credentials: false
 
-      # Branches >= 5.9 call this workflow at @trunk without the producer job, so they
-      # pass no artifact. They skip this step and fall back to a per-job download.
+      # Only WordPress 7.0+ include Gutenberg-maintained assets from a built zip file.
       - name: Download prepared Gutenberg build
-        if: inputs.gutenberg-artifact != ''
+        if: ${{ inputs.gutenberg-artifact }}
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
-          # Without a run ID, this action reads only from the caller's current workflow run.
-          name: ${{ inputs.gutenberg-artifact }}
+          name: gutenberg-build
           path: gutenberg
           digest-mismatch: error

trunk/.github/workflows/test-coverage.yml

@@ -53 +53 @@
   # Downloads and verifies the Gutenberg build once for all coverage jobs.
   prepare-gutenberg:
+    name: Prepare Gutenberg Assets
     uses: ./.github/workflows/reusable-prepare-gutenberg.yml
     permissions:
@@ -77 +78 @@
       multisite: ${{ matrix.multisite }}
       coverage-report: ${{ matrix.coverage-report }}
-      gutenberg-artifact: gutenberg-build
+      gutenberg-artifact: ${{ needs.prepare-gutenberg.result != 'skipped' }}
       gutenberg-sha: ${{ needs.prepare-gutenberg.outputs.gutenberg-sha }}
     secrets: