chore: Try forcing auto crlf on

fuzzybinary · Aug 30, 2024 · a42d27e · a42d27e
1 parent 476670f
commit a42d27e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -23,6 +23,7 @@ jobs:
     continue-on-error: true
     runs-on: ${{ matrix.os }}
     steps:
+      - run: git config --global core.autocrlf true
       - uses: actions/checkout@v3
       - uses: dart-lang/setup-dart@v1
       - uses: ilammy/msvc-dev-cmd@v1

diff --git a/scripts/build_helpers/bin/build_dart.dart b/scripts/build_helpers/bin/build_dart.dart
@@ -160,8 +160,8 @@ Future<bool> _patchDartSdk() async {
   final logger = BuildToolsLogger.shared;
   final result = await inDir('dart-sdk/sdk', () async {
     logger.i("Patching the Dart SDK to create libdart");
-    var result = await Process.run('git',
-        ['apply', '--reject', '--whitespace=fix', '../../dart_sdk.patch'],
+    var result = await Process.run(
+        'git', ['apply', '--whitespace=fix', '../../dart_sdk.patch'],
         runInShell: true);
     logger.d("[patch-stdout] ${result.stdout}");
     logger.d("[patch-stderr] ${result.stderr}");