From 62da65257d6a6df42f7f445f7bd7bb38865b02a2 Mon Sep 17 00:00:00 2001 From: William Hesse Date: Fri, 12 Jan 2024 13:04:29 +0100 Subject: [PATCH] Do not reset framework checkout before running customer tests (#141013) The migration of customer tests to sharded tests adds a step that checks out the current tip-of-tree of the framework repo, removing local changes. This does not work with monorepo testing, which modifies engine.version, and does not work with local testing of a branch. The sharded tests should already be running with the correct checkout of the framework repo. If the REVISION environment variable is set, the framework checkout will still be reset to check out that revision. These commands were migrated from the existing shell script to the sharded tester in https://github.com/flutter/flutter/pull/138659 Bug: https://github.com/dart-lang/sdk/issues/51042 --- dev/bots/test.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev/bots/test.dart b/dev/bots/test.dart index f1edc9b264e..d505fd1abff 100644 --- a/dev/bots/test.dart +++ b/dev/bots/test.dart @@ -1577,8 +1577,10 @@ Future _runCustomerTesting() async { await runCommand( 'git', [ - 'checkout', + 'branch', + '-f', 'master', + 'origin/master', ], workingDirectory: flutterRoot, );