Merge branch 'trunk' into trac-64389

Author: westonruter

.github/setup-node/action.yml

@@ -10,7 +10,7 @@ runs:
     using: 'composite'
     steps:
         - name: Use desired version of Node.js
-          uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+          uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
           with:
               node-version-file: ${{ inputs.node-version == '' && '.nvmrc' || '' }}
               node-version: ${{ inputs.node-version }}

.github/workflows/build-plugin-zip.yml

@@ -179,7 +179,7 @@ jobs:
                   fi
 
     build:
-        name: Build Release Artifact
+        name: ${{ matrix.IS_WORDPRESS_CORE && 'Build assets for wordpress-develop' || 'Build Release Artifact' }}
         runs-on: 'ubuntu-24.04'
         permissions:
             contents: read
@@ -190,6 +190,15 @@ jobs:
               github.event_name == 'workflow_dispatch' ||
               github.repository == 'WordPress/gutenberg'
             )
+        strategy:
+            matrix:
+                IS_GUTENBERG_PLUGIN: [true]
+                IS_WORDPRESS_CORE: [false]
+
+                include:
+                    - IS_GUTENBERG_PLUGIN: false
+                      IS_WORDPRESS_CORE: true
+
         outputs:
             job_status: ${{ job.status }}
 
@@ -202,24 +211,30 @@ jobs:
                   persist-credentials: false
 
             - name: Use desired version of Node.js
-              uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+              uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
               with:
                   node-version-file: '.nvmrc'
                   check-latest: true
 
+            - name: Configure build for wordpress-develop
+              if: ${{ matrix.IS_WORDPRESS_CORE }}
+              run: jq --tab '.wpPlugin.name = "wp"' package.json > package.json.tmp && mv package.json.tmp package.json
+
             - name: Build Gutenberg plugin ZIP file
               run: ./bin/build-plugin-zip.sh
               env:
                   NO_CHECKS: 'true'
+                  IS_GUTENBERG_PLUGIN: ${{ matrix.IS_GUTENBERG_PLUGIN }}
+                  IS_WORDPRESS_CORE: ${{ matrix.IS_WORDPRESS_CORE }}
 
             - name: Upload artifact
               uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
               with:
-                  name: gutenberg-plugin
+                  name: gutenberg-${{ matrix.IS_WORDPRESS_CORE && 'wordpress-develop' || 'plugin' }}
                   path: ./gutenberg.zip
 
             - name: Build release notes draft
-              if: ${{ needs.bump-version.outputs.new_version }}
+              if: ${{ matrix.IS_GUTENBERG_PLUGIN && needs.bump-version.outputs.new_version }}
               env:
                   VERSION: ${{ needs.bump-version.outputs.new_version }}
               run: |
@@ -235,12 +250,65 @@ jobs:
                   fi
 
             - name: Upload release notes artifact
-              if: ${{ needs.bump-version.outputs.new_version }}
+              if: ${{ matrix.IS_GUTENBERG_PLUGIN && needs.bump-version.outputs.new_version }}
               uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
               with:
                   name: release-notes
                   path: ./release-notes.txt
 
+    # Publishes the built plugin zip file to the GitHub Container registry.
+    publish-to-container-registry:
+        name: Publish to GitHub Container Registry
+        runs-on: 'ubuntu-24.04'
+        needs: ['bump-version', 'build']
+        permissions:
+            contents: read
+            packages: write
+        if: |
+            always() &&
+            needs.build.outputs.job_status == 'success' &&
+            github.repository == 'WordPress/gutenberg' &&
+            github.event_name == 'push'
+
+        steps:
+            - name: Download build artifact
+              uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+              with:
+                  name: gutenberg-wordpress-develop
+
+            - name: Unzip zip artifact
+              run: unzip gutenberg.zip && rm gutenberg.zip
+
+            # Noting the hash helps keep track of the commit the zip was built from.
+            - name: Add a file for tracking the SHA value used.
+              run: echo "${{ github.sha }}" > .gutenberg-hash
+
+            - name: Recompress as a .gz file
+              run: tar -czf ${{ runner.temp }}/gutenberg.tar.gz . && mv ${{ runner.temp }}/gutenberg.tar.gz .
+
+            - name: Login to GitHub Container Registry
+              uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
+              with:
+                  registry: ghcr.io
+                  username: ${{ github.actor }}
+                  password: ${{ secrets.GITHUB_TOKEN }}
+
+            # OCI Registry As Storage (ORAS) provides a way to push and pull non-image, generic artifacts (.gz files,
+            # for example) to container registries such as GitHub Container Registry.
+            - name: Setup ORAS
+              uses: oras-project/setup-oras@22ce207df3b08e061f537244349aac6ae1d214f6 # v1.2.4
+
+            # The owner/repository is hard-coded because capital letters are not allowed when publishing to GitHub
+            # Container Registry. The organization name is WordPress, so ${{ github.repository }} causes an error.
+            # See https://github.com/orgs/community/discussions/27086 for more info.
+            - name: Push built plugin .tar.gz file to GitHub Container Registry
+              run: |
+                  oras push "ghcr.io/wordpress/gutenberg/gutenberg-wp-develop-build:${{ github.sha }}" \
+                  "gutenberg.tar.gz:application/gzip" \
+                  --annotation "org.opencontainers.image.description=Gutenberg plugin build for commit ${{ github.sha }}" \
+                  --annotation "org.opencontainers.image.source=https://github.com/${{ github.repository }}" \
+                  --annotation "org.opencontainers.image.revision=${{ github.sha }}"
+
     revert-version-bump:
         name: Revert version bump if build failed
         needs: [bump-version, build]
@@ -379,7 +447,7 @@ jobs:
                   git config user.email [email protected]
 
             - name: Setup Node.js
-              uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+              uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
               with:
                   node-version-file: 'main/.nvmrc'
                   registry-url: 'https://registry.npmjs.org'

.github/workflows/bundle-size.yml

@@ -56,7 +56,7 @@ jobs:
                   persist-credentials: false
 
             - name: Use desired version of Node.js
-              uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+              uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
               with:
                   node-version-file: '.nvmrc'
                   check-latest: true

.github/workflows/cherry-pick-wp-release.yml

@@ -1,15 +1,13 @@
 name: Auto Cherry-Pick
 
 on:
-    push:
-        branches:
-            - trunk
-    # We also want to attempt cherry-picking when a PR is labeled after the PR
-    # is merged. Using pull_request_target instead of pull_request so that
-    # the workflow has access to repository secrets for fork PRs.
+    # closed: cherry-pick when a labeled PR is merged.
+    # labeled: cherry-pick when a label is added after the PR is merged.
+    # Using pull_request_target instead of pull_request so that the workflow
+    # has access to repository secrets for fork PRs.
     # https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request_target
     pull_request_target:
-        types: [labeled]
+        types: [closed, labeled]
         branches:
             - trunk
 
@@ -29,36 +27,22 @@ jobs:
             contents: write
             issues: write
             pull-requests: write
-        # When in the context of a PR, ensure the PR is merged.
-        if: github.event.pull_request == null || github.event.pull_request.merged == true
+        if: github.event.pull_request.merged == true
         steps:
             - name: Determine if label should trigger cherry-pick
               id: label-check
               uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
               with:
                   script: |
-                      const commit_sha = context.payload.pull_request ? context.payload.pull_request.merge_commit_sha : context.sha;
+                      const pr = context.payload.pull_request;
+                      const commit_sha = pr.merge_commit_sha;
+                      const pr_number = pr.number;
                       console.log(`Commit SHA: ${commit_sha}`);
-                      core.exportVariable('commit_sha', commit_sha);
-                      const prs = await github.rest.repos.listPullRequestsAssociatedWithCommit({
-                        owner: context.repo.owner,
-                        repo: context.repo.repo,
-                        commit_sha,
-                      });
-                      if (prs.data.length === 0) {
-                        console.log(`No PR found for commit ${context.sha}.`);
-                        return;
-                      }
-                      const pr_number = prs.data[0].number;
                       console.log(`PR: ${pr_number}`);
+                      core.exportVariable('commit_sha', commit_sha);
                       core.exportVariable('pr_number', pr_number);
 
-                      const pr = await github.rest.pulls.get({
-                        owner: context.repo.owner,
-                        repo: context.repo.repo,
-                        pull_number: pr_number,
-                      });
-                      const labels = pr.data.labels.map(label => label.name);
+                      const labels = pr.labels.map(label => label.name);
                       console.log(`Labels: ${labels}`);
                       const regex = /^Backport to WP ([0-9]+\.[0-9]+) Beta\/RC$/;
                       let matched = false;

.github/workflows/enforce-pr-labels.yml

@@ -10,6 +10,7 @@ permissions: {}
 jobs:
     type-related-labels:
         runs-on: 'ubuntu-24.04'
+        if: ${{ github.event.pull_request.state == 'open' }}
         permissions:
             pull-requests: write
         steps:

.github/workflows/publish-npm-packages.yml

@@ -77,15 +77,15 @@ jobs:
 
             - name: Setup Node.js
               if: ${{ github.event.inputs.release_type != 'wp' }}
-              uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+              uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
               with:
                   node-version-file: 'cli/.nvmrc'
                   registry-url: 'https://registry.npmjs.org'
                   check-latest: true
 
             - name: Setup Node.js (for WP major version)
               if: ${{ github.event.inputs.release_type == 'wp' && github.event.inputs.wp_version }}
-              uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+              uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
               with:
                   node-version-file: 'publish/.nvmrc'
                   registry-url: 'https://registry.npmjs.org'

.github/workflows/static-checks.yml

@@ -33,6 +33,12 @@ jobs:
                 event: ['${{ github.event_name }}']
                 node: ['20', '22', '24']
                 os: ['macos-15', 'ubuntu-24.04', 'windows-2025']
+
+                include:
+                    # Only generate annotations once.
+                    - node: '24'
+                      os: 'ubuntu-24.04'
+                      annotations: true
                 exclude:
                     # On PRs: Only test Node 20 on Ubuntu and Windows
                     - event: 'pull_request'
@@ -47,14 +53,15 @@ jobs:
                   persist-credentials: false
 
             - name: Use desired version of Node.js
-              uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
+              uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
               with:
                   node-version: ${{ matrix.node }}
+                  cache: npm
 
             - name: Pin npm version for consistency
               run: npm install -g npm@10
 
-            - name: Npm install
+            - name: npm install
               # A "full" install is executed, since `npm ci` does not always exit
               # with an error status code if the lock file is inaccurate. This also
               # helps to catch dependencies not being installed with exact version.
@@ -63,8 +70,22 @@ jobs:
               # See: https://github.com/WordPress/gutenberg/pull/39865
               run: npm install
 
-            - name: Lint JavaScript and Styles
-              run: npm run lint
+            - name: Lint package.json files
+              run: npm run lint:pkg-json
+
+            - name: Lint package-lock.json file
+              run: npm run lint:lockfile
+
+            - name: Validate TypeScript config
+              run: npm run lint:tsconfig
+
+            - name: Lint JavaScript
+              if: ${{ matrix.annotations }}
+              run: npm run lint:js -- --format compact
+
+            - name: Lint Styles
+              if: ${{ matrix.annotations }}
+              run: npm run lint:css -- --formatter compact
 
             - name: Type checking
               run: npm run build

backport-changelog/7.0/10894.md

@@ -5,6 +5,4 @@ https://github.com/WordPress/wordpress-develop/pull/10894
 * https://github.com/WordPress/gutenberg/pull/75682
 * https://github.com/WordPress/gutenberg/pull/75708
 * https://github.com/WordPress/gutenberg/pull/75711
-* https://github.com/WordPress/gutenberg/pull/75746
 * https://github.com/WordPress/gutenberg/pull/75869
-* https://github.com/WordPress/gutenberg/pull/76060

backport-changelog/7.0/10981.md

@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/10981
+
+* https://github.com/WordPress/gutenberg/pull/75746

backport-changelog/7.0/11098.md

@@ -0,0 +1,3 @@
+https://github.com/WordPress/wordpress-develop/pull/11098
+
+* https://github.com/WordPress/gutenberg/pull/75991