Skip to content

Commit 6060cfb

Browse files
committed
chore: swift-integ fix
1 parent 152f6b5 commit 6060cfb

File tree

3 files changed

+31
-6
lines changed

3 files changed

+31
-6
lines changed

.github/workflows/scripts/swift-integration.dart

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -449,20 +449,27 @@ Future<ProcessResult> _runCommand(
449449
print('[DEBUG] Current working directory: ${Directory.current.path}');
450450
}
451451

452-
final process = await Process.start(command, arguments);
452+
final process = await Process.start(
453+
command,
454+
arguments,
455+
runInShell: false,
456+
mode: ProcessStartMode.normal,
457+
);
453458

454459
final stdoutBuffer = StringBuffer();
455460
final stderrBuffer = StringBuffer();
456461

457-
// Listen to stdout
462+
// Stream stdout directly to the parent process to avoid CI timeouts that
463+
// happen when there is no console output for long-running commands.
458464
process.stdout.transform(utf8.decoder).listen((data) {
459465
stdoutBuffer.write(data);
466+
stdout.write(data);
460467
});
461468

462-
// Listen to stderr
469+
// Stream stderr as well, keeping the buffer for any follow-up processing.
463470
process.stderr.transform(utf8.decoder).listen((data) {
464471
stderrBuffer.write(data);
465-
print('stderr output: $data');
472+
stderr.write(data);
466473
});
467474

468475
// Wait for the process to complete

tests/macos/Runner.xcodeproj/project.pbxproj

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@
185185
3399D490228B24CF009A79C7 /* ShellScript */,
186186
B6FDA406E9A0EB363B9CC88C /* [CP] Embed Pods Frameworks */,
187187
76D37D3A2A5275D5E0B8B1B9 /* [firebase_crashlytics] Crashlytics Upload Symbols */,
188+
F6D8840301EEB854C8ACBD59 /* [CP] Copy Pods Resources */,
188189
);
189190
buildRules = (
190191
);
@@ -203,7 +204,7 @@
203204
isa = PBXProject;
204205
attributes = {
205206
LastSwiftUpdateCheck = 0920;
206-
LastUpgradeCheck = 1300;
207+
LastUpgradeCheck = 1510;
207208
ORGANIZATIONNAME = "";
208209
TargetAttributes = {
209210
33CC10EC2044A3C60003C045 = {
@@ -351,6 +352,23 @@
351352
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
352353
showEnvVarsInLog = 0;
353354
};
355+
F6D8840301EEB854C8ACBD59 /* [CP] Copy Pods Resources */ = {
356+
isa = PBXShellScriptBuildPhase;
357+
buildActionMask = 2147483647;
358+
files = (
359+
);
360+
inputFileListPaths = (
361+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
362+
);
363+
name = "[CP] Copy Pods Resources";
364+
outputFileListPaths = (
365+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
366+
);
367+
runOnlyForDeploymentPostprocessing = 0;
368+
shellPath = /bin/sh;
369+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
370+
showEnvVarsInLog = 0;
371+
};
354372
/* End PBXShellScriptBuildPhase section */
355373

356374
/* Begin PBXSourcesBuildPhase section */

tests/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)