diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1e330d3..7863e39 100644 --- 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 index 4916fc9..7066dd8 100644 --- a/scripts/build_helpers/bin/build_dart.dart +++ b/scripts/build_helpers/bin/build_dart.dart @@ -160,8 +160,8 @@ Future _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}");