Skip to content

Commit 05db0f2

Browse files
committed
chore: add diagnostics to patch call, await directory creation
Update patch to 3.5 SDK to avoid windows github actions build errors.
1 parent ecd6214 commit 05db0f2

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

Diff for: dart_sdk.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/BUILD.gn b/BUILD.gn
2-
index 233a0900e55..5010af8fc55 100644
2+
index 3dd681d9d41..a8e43bc5953 100644
33
--- a/BUILD.gn
44
+++ b/BUILD.gn
5-
@@ -99,6 +99,10 @@ group("create_sdk") {
5+
@@ -100,6 +100,10 @@ group("create_sdk") {
66
public_deps = [ "sdk:create_sdk" ]
77
}
88

@@ -14,10 +14,10 @@ index 233a0900e55..5010af8fc55 100644
1414
public_deps = [ "sdk:create_platform_sdk" ]
1515
}
1616
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
17-
index fb45d1ec551..9ccb1a27f4a 100644
17+
index 29ada988abb..2e4cf4ea9c8 100644
1818
--- a/build/config/compiler/BUILD.gn
1919
+++ b/build/config/compiler/BUILD.gn
20-
@@ -269,8 +269,9 @@ config("compiler") {
20+
@@ -260,8 +260,9 @@ config("compiler") {
2121
cflags += [ "-fPIC" ]
2222
ldflags += [ "-fPIC" ]
2323
} else {
@@ -30,10 +30,10 @@ index fb45d1ec551..9ccb1a27f4a 100644
3030
}
3131

3232
diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn
33-
index 91ebf8feb65..4ecf43807d4 100644
33+
index be0893506f2..7c5bb919ad4 100644
3434
--- a/runtime/bin/BUILD.gn
3535
+++ b/runtime/bin/BUILD.gn
36-
@@ -1143,3 +1143,47 @@ if (defined(is_linux) && is_linux && defined(is_asan) && is_asan &&
36+
@@ -1170,3 +1170,47 @@ if (defined(is_linux) && is_linux && defined(is_asan) && is_asan &&
3737
}
3838
}
3939
}

Diff for: scripts/build_helpers/bin/build_dart.dart

+3-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Future<bool> _fetchOrUpdateDartSdk() async {
101101
if (!Directory('dart-sdk').existsSync()) {
102102
logger.i('dart-sdk does not exist. Doing full fetch');
103103

104-
Directory('dart-sdk').create();
104+
await Directory('dart-sdk').create();
105105

106106
final fetchResult = await inDir('dart-sdk', () async {
107107
final fetchProcess =
@@ -162,6 +162,8 @@ Future<bool> _patchDartSdk() async {
162162
logger.i("Patching the Dart SDK to create libdart");
163163
var result = await Process.run('git', ['apply', '../../dart_sdk.patch'],
164164
runInShell: true);
165+
logger.d("[patch-stdout] ${result.stdout}");
166+
logger.d("[patch-stderr] ${result.stderr}");
165167
logger.d('Patch result is ${result.exitCode}');
166168
return result.exitCode;
167169
});

0 commit comments

Comments
 (0)