Fix Netlify upload CI regressions

Author: snissn

packages/cli/src/index.ts

@@ -2324,6 +2324,19 @@ function resolveUploadManifestConfig(featuresUploads: boolean): UploadManifestCo
   };
 }
 
+function hasExplicitUploadManifestOverrideEnv(): boolean {
+  return [
+    'TH_UPLOAD_REMOTE_BASE_URL',
+    'TH_UPLOAD_REMOTE_ENDPOINT_URL',
+    'TH_UPLOAD_REMOTE_STATUS_URL',
+    'TH_UPLOAD_RUNNER',
+    'TH_UPLOAD_PROVIDER',
+    'TH_UPLOAD_BASE_URL',
+    'TH_UPLOAD_ACCEPT',
+    'TH_UPLOAD_MAX_BYTES'
+  ].some((key) => String(process.env[key] ?? '').trim() !== '');
+}
+
 function normalizeFunctionsDirectory(value: string | undefined): string {
   const trimmed = String(value ?? '').trim().replace(/^\/+|\/+$/g, '');
   if (!trimmed) return 'netlify/functions';
@@ -3862,19 +3875,22 @@ function buildFromSchema(
   const zeroAddress = '0x0000000000000000000000000000000000000000';
   const txMode = resolveTxMode(opts.txMode, Number(opts.targetChainId ?? anvil.id));
   const relayBaseUrl = String(opts.relayBaseUrl ?? process.env.TH_RELAY_BASE_URL ?? '/__tokenhost/relay').trim() || '/__tokenhost/relay';
+  const explicitUploadManifestConfig = hasExplicitUploadManifestOverrideEnv() ? resolveUploadManifestConfig(features.uploads) : null;
   const netlifyUploadBuild = resolveNetlifyUploadBuildConfig(schema);
-  const uploadConfig = netlifyUploadBuild
-    ? {
-        enabled: true,
-        baseUrl: netlifyUploadBuild.endpointUrl,
-        endpointUrl: netlifyUploadBuild.endpointUrl,
-        statusUrl: netlifyUploadBuild.statusUrl,
-        provider: netlifyUploadBuild.provider,
-        runnerMode: 'remote' as const,
-        accept: netlifyUploadBuild.accept,
-        maxBytes: netlifyUploadBuild.maxBytes
-      }
-    : resolveUploadManifestConfig(features.uploads);
+  const uploadConfig =
+    explicitUploadManifestConfig ??
+    (netlifyUploadBuild
+      ? {
+          enabled: true,
+          baseUrl: netlifyUploadBuild.endpointUrl,
+          endpointUrl: netlifyUploadBuild.endpointUrl,
+          statusUrl: netlifyUploadBuild.statusUrl,
+          provider: netlifyUploadBuild.provider,
+          runnerMode: 'remote' as const,
+          accept: netlifyUploadBuild.accept,
+          maxBytes: netlifyUploadBuild.maxBytes
+        }
+      : resolveUploadManifestConfig(features.uploads));
 
   const manifest = {
     manifestVersion: '0.1.0',

test/integration/testGeneratedAppUiTests.js

@@ -1,5 +1,6 @@
 import { expect } from 'chai';
 import fs from 'fs';
+import net from 'net';
 import os from 'os';
 import path from 'path';
 import { spawn, spawnSync } from 'child_process';
@@ -58,6 +59,23 @@ function waitForOutput(proc, pattern, timeoutMs) {
   });
 }
 
+function getAvailablePort(host) {
+  return new Promise((resolve, reject) => {
+    const server = net.createServer();
+    server.unref();
+    server.on('error', reject);
+    server.listen(0, host, () => {
+      const address = server.address();
+      const port = typeof address === 'object' && address ? address.port : null;
+      server.close((err) => {
+        if (err) reject(err);
+        else if (!port) reject(new Error('Unable to determine an available port.'));
+        else resolve(port);
+      });
+    });
+  });
+}
+
 describe('Generated app UI tests', function () {
   it('emits schema-aware UI smoke tests that pass against canonical job-board preview', async function () {
     this.timeout(240000);
@@ -79,7 +97,7 @@ describe('Generated app UI tests', function () {
     expect(buildRes.status, buildRes.stderr || buildRes.stdout).to.equal(0);
 
     const host = '127.0.0.1';
-    const port = 46000 + Math.floor(Math.random() * 1000);
+    const port = await getAvailablePort(host);
     const baseUrl = `http://${host}:${port}`;
     const preview = spawn(
       'node',

test/integration/testMicroblogRemoteUploadFlow.js

@@ -1,5 +1,6 @@
 import { expect } from 'chai';
 import fs from 'fs';
+import net from 'net';
 import os from 'os';
 import path from 'path';
 import { spawn, spawnSync } from 'child_process';
@@ -57,6 +58,23 @@ async function request(url, init) {
   return { status: res.status, json, buffer, headers: res.headers };
 }
 
+function getAvailablePort(host) {
+  return new Promise((resolve, reject) => {
+    const server = net.createServer();
+    server.unref();
+    server.on('error', reject);
+    server.listen(0, host, () => {
+      const address = server.address();
+      const port = typeof address === 'object' && address ? address.port : null;
+      server.close((err) => {
+        if (err) reject(err);
+        else if (!port) reject(new Error('Unable to determine an available port.'));
+        else resolve(port);
+      });
+    });
+  });
+}
+
 describe('Microblog example remote upload adapter flow', function () {
   it('builds the canonical microblog app against a standalone remote upload adapter', async function () {
     this.timeout(180000);
@@ -65,7 +83,7 @@ describe('Microblog example remote upload adapter flow', function () {
     const outDir = path.join(fs.mkdtempSync(path.join(os.tmpdir(), 'th-microblog-remote-')), 'out');
 
     const adapterHost = '127.0.0.1';
-    const adapterPort = 48000 + Math.floor(Math.random() * 1000);
+    const adapterPort = await getAvailablePort(adapterHost);
     const adapterBaseUrl = `http://${adapterHost}:${adapterPort}`;
     const adapterEndpointPath = '/api/upload';
     const adapterStatusPath = '/api/upload/status';
@@ -87,7 +105,7 @@ describe('Microblog example remote upload adapter flow', function () {
     });
 
     const previewHost = '127.0.0.1';
-    const previewPort = 49000 + Math.floor(Math.random() * 1000);
+    const previewPort = await getAvailablePort(previewHost);
     const previewBaseUrl = `http://${previewHost}:${previewPort}`;
 
     let preview = null;