Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
657bca4b
Unverified
Commit
657bca4b
authored
Jan 26, 2022
by
Zachary Anderson
Committed by
GitHub
Jan 26, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[tool] Use an arm64 Dart SDK on arm64 macOS (#97189)
parent
790ca116
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
1 deletion
+20
-1
update_dart_sdk.sh
bin/internal/update_dart_sdk.sh
+1
-1
cache_test.dart
...ages/flutter_tools/test/integration.shard/cache_test.dart
+19
-0
No files found.
bin/internal/update_dart_sdk.sh
View file @
657bca4b
...
...
@@ -71,7 +71,7 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t
case
"
$(
uname
-s
)
"
in
Darwin
)
DART_ZIP_NAME
=
"dart-sdk-darwin-
x64
.zip"
DART_ZIP_NAME
=
"dart-sdk-darwin-
${
ARCH
}
.zip"
IS_USER_EXECUTABLE
=
"-perm +100"
;;
Linux
)
...
...
packages/flutter_tools/test/integration.shard/cache_test.dart
View file @
657bca4b
...
...
@@ -113,6 +113,25 @@ exit(0);
expect
(
logger
.
hadWarningOutput
,
isTrue
);
});
});
testWithoutContext
(
'Dart SDK target arch matches host arch'
,
()
async
{
if
(
platform
.
isWindows
)
{
return
;
}
final
ProcessResult
dartResult
=
await
const
LocalProcessManager
().
run
(
<
String
>[
dart
,
'--version'
],
);
// Parse 'arch' out of a string like '... "os_arch"\n'.
final
String
dartTargetArch
=
(
dartResult
.
stdout
as
String
)
.
trim
().
split
(
' '
).
last
.
replaceAll
(
'"'
,
''
).
split
(
'_'
)[
1
];
final
ProcessResult
unameResult
=
await
const
LocalProcessManager
().
run
(
<
String
>[
'uname'
,
'-m'
],
);
final
String
unameArch
=
(
unameResult
.
stdout
as
String
)
.
trim
().
replaceAll
(
'aarch64'
,
'arm64'
)
.
replaceAll
(
'x86_64'
,
'x64'
);
expect
(
dartTargetArch
,
equals
(
unameArch
));
});
}
class
FakeArtifactUpdater
extends
Fake
implements
ArtifactUpdater
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment