Skip to content

Commit 4d868d2

Browse files
committed
test
1 parent 53dbf92 commit 4d868d2

File tree

2 files changed

+32
-3
lines changed

2 files changed

+32
-3
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,13 @@ jobs:
119119
run: |
120120
mkdir C:\workspace\flutter
121121
cd C:\workspace\flutter
122-
git config --global core.autocrlf true
122+
# git config --global core.autocrlf true
123+
124+
git config --global core.autocrlf false
125+
git config --global core.filemode false
126+
git config --global core.fscache true
127+
git config --global core.preloadindex true
128+
git config --global depot-tools.allowGlobalGitConfig true
123129
git init --quiet
124130
git remote add origin https://github.com/${{ github.repository }}
125131
git fetch --depth 1 origin ${{ github.sha }}
@@ -129,7 +135,7 @@ jobs:
129135
run: |
130136
Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" -Name "LongPathsEnabled" -Value 1 -Force
131137
echo "DEPOT_TOOLS_WIN_TOOLCHAIN=0" >> $Env:GITHUB_ENV
132-
echo "GYP_MSVS_OVERRIDE_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise" >> $Env:GITHUB_ENV
138+
echo "GYP_MSVS_OVERRIDE_PATH=C:\Program Files\Microsoft Visual Studio\2022\Enterprise" >> $Env:GITHUB_ENV
133139
echo "WINDOWSSDKDIR=C:\Program Files (x86)\Windows Kits\10" >> $Env:GITHUB_ENV
134140
135141
- name: Install depot_tools
@@ -147,7 +153,7 @@ jobs:
147153
# TODO(jsuya) : pipes deprecated in python 3.13. (https://dart-review.googlesource.com/c/sdk/+/307620)
148154
(Get-Content "engine/src/build/vs_toolchain.py") | ForEach-Object { $_ -replace 'import pipes','' } | Set-Content "engine/src/build/vs_toolchain.py"
149155
gclient setdep --var=download_dart_sdk=False --var=download_android_deps=False --var=download_fuchsia_deps=False --deps-file=DEPS
150-
gclient sync -v --no-history --shallow --with_tags
156+
gclient sync -v --no-history --shallow
151157
152158
- name: Build
153159
working-directory: C:\workspace\flutter\engine\src
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
diff --git a/tools/generate_package_config.dart b/tools/generate_package_config.dart
2+
index 01a7a0e9469..d24470e6824 100644
3+
--- a/tools/generate_package_config.dart
4+
+++ b/tools/generate_package_config.dart
5+
@@ -102,12 +102,11 @@ $overrides
6+
String currentSDKVersion() {
7+
final versionContents =
8+
File.fromUri(repoRoot.resolve('tools/VERSION')).readAsStringSync();
9+
- final lines = versionContents
10+
- .split('\n')
11+
- .where((line) => !line.startsWith('#') && line.isNotEmpty);
12+
- final versionParts = Map.fromEntries(lines.map((line) {
13+
- final parts = line.split(' ');
14+
- return MapEntry(parts[0], parts[1]);
15+
- }));
16+
+ final lines = LineSplitter.split(versionContents);
17+
+ final versionParts = {
18+
+ for (var line in lines)
19+
+ if (line.isNotEmpty && !line.startsWith('#'))
20+
+ if (line.split(' ') case [final key, final value]) key: value
21+
+ };
22+
return '${versionParts['MAJOR']}.${versionParts['MINOR']}.${versionParts['PATCH']}';
23+
}

0 commit comments

Comments
 (0)