Merge branch 'trunk' into update/social-initial-state-migrate-feature…

…-flags
Automattic · Aug 29, 2024 · 7d94532 · 7d94532
2 parents 2536633 + 7801b7f
commit 7d94532
Show file tree

Hide file tree

Showing 283 changed files with 2,211 additions and 2,610 deletions.
diff --git a/.github/actions/tool-setup/action.yml b/.github/actions/tool-setup/action.yml
@@ -89,7 +89,7 @@ runs:
 
     - name: Setup pnpm
       if: steps.versions.outputs.node-version != 'false'
-      uses: pnpm/action-setup@v3.0.0
+      uses: pnpm/action-setup@v4.0.0
       with:
         version: ${{ steps.versions.outputs.pnpm-version }}
     - name: Setup Node

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -88,7 +88,7 @@ jobs:
             org.opencontainers.image.documentation=${{ github.server_url }}/${{ github.repository }}/blob/trunk/tools/docker/README.md
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: tools/docker
           platforms: linux/amd64,linux/arm64