Merge branch 'main' into logs-for-agents

Author: serhalp

.github/workflows/integration-tests.yml

@@ -69,6 +69,7 @@ jobs:
           # We set a flag so we can skip tests that access Netlify API
           NETLIFY_TEST_DISABLE_LIVE:
             ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true }}
+          NETLIFY_TEST_ACCOUNT_SLUG: 'netlify-integration-testing'
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           # NETLIFY_TEST_GITHUB_TOKEN is used to avoid reaching GitHub API limits in exec-fetcher.js
           NETLIFY_TEST_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package-lock.json

@@ -59,20 +59,20 @@
   "dependencies": {
     "@fastify/static": "9.0.0",
     "@netlify/ai": "0.3.4",
-    "@netlify/api": "14.0.13",
+    "@netlify/api": "14.0.14",
     "@netlify/blobs": "10.1.0",
-    "@netlify/build": "35.5.14",
+    "@netlify/build": "35.7.1",
     "@netlify/build-info": "10.3.0",
-    "@netlify/config": "24.3.0",
+    "@netlify/config": "24.4.0",
     "@netlify/dev-utils": "4.3.2",
-    "@netlify/edge-bundler": "14.9.5",
+    "@netlify/edge-bundler": "14.9.8",
     "@netlify/edge-functions": "3.0.3",
     "@netlify/edge-functions-bootstrap": "2.17.1",
     "@netlify/headers-parser": "9.0.2",
     "@netlify/images": "1.2.5",
     "@netlify/local-functions-proxy": "2.0.3",
     "@netlify/redirect-parser": "15.0.3",
-    "@netlify/zip-it-and-ship-it": "14.3.1",
+    "@netlify/zip-it-and-ship-it": "14.3.2",
     "@octokit/rest": "22.0.0",
     "@opentelemetry/api": "1.8.0",
     "@pnpm/tabtab": "0.5.4",

package.json

@@ -5,7 +5,7 @@ import { fileURLToPath } from 'url'
 import { load } from 'cheerio'
 import execa from 'execa'
 import fetch from 'node-fetch'
-import { afterAll, beforeAll, describe, expect, test } from 'vitest'
+import { afterAll, beforeAll, describe, expect, test, vi } from 'vitest'
 
 import { callCli } from '../../utils/call-cli.js'
 import { createLiveTestSite, generateSiteName } from '../../utils/create-live-test-site.js'
@@ -86,7 +86,13 @@ const context: { account: unknown; siteId: string } = {
   account: undefined,
 }
 
-describe.skipIf(process.env.NETLIFY_TEST_DISABLE_LIVE === 'true').concurrent('commands/deploy', () => {
+const disableLiveTests = process.env.NETLIFY_TEST_DISABLE_LIVE === 'true'
+
+// Running multiple entire build + deploy cycles concurrently results in a lot of network requests that may
+// cause resource contention anyway, so lower the default concurrency from 5 to 3.
+vi.setConfig({ maxConcurrency: 3 })
+
+describe.skipIf(disableLiveTests).concurrent('commands/deploy', { timeout: 300_000 }, () => {
   beforeAll(async () => {
     const { account, siteId } = await createLiveTestSite(SITE_NAME)
     context.siteId = siteId