From da8ead178a7dc53a539e0e006224cb1451960a06 Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Tue, 8 Dec 2020 15:39:47 -0600 Subject: [PATCH 1/4] test: clear changes in tmp devtools checkout --- lighthouse-core/test/chromium-web-tests/download-devtools.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lighthouse-core/test/chromium-web-tests/download-devtools.sh b/lighthouse-core/test/chromium-web-tests/download-devtools.sh index efe8e2e4bf9b..956a11fc9661 100644 --- a/lighthouse-core/test/chromium-web-tests/download-devtools.sh +++ b/lighthouse-core/test/chromium-web-tests/download-devtools.sh @@ -14,6 +14,7 @@ then cd "$DEVTOOLS_PATH" # Update to keep current + git reset --hard git pull -f origin master gclient sync From 0f0ff4bd84e9670ab8ad995efa5ade8a3215e0d3 Mon Sep 17 00:00:00 2001 From: Connor Clark Date: Tue, 8 Dec 2020 15:49:16 -0600 Subject: [PATCH 2/4] ok --- lighthouse-core/test/chromium-web-tests/download-devtools.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lighthouse-core/test/chromium-web-tests/download-devtools.sh b/lighthouse-core/test/chromium-web-tests/download-devtools.sh index 956a11fc9661..4c70f97ec10c 100644 --- a/lighthouse-core/test/chromium-web-tests/download-devtools.sh +++ b/lighthouse-core/test/chromium-web-tests/download-devtools.sh @@ -14,7 +14,7 @@ then cd "$DEVTOOLS_PATH" # Update to keep current - git reset --hard + git clean -fd git pull -f origin master gclient sync From b714d92a4d6c18f0e0cbfa17e3ff9306cdaa0b46 Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Tue, 8 Dec 2020 14:00:40 -0800 Subject: [PATCH 3/4] Update lighthouse-core/test/chromium-web-tests/download-devtools.sh --- lighthouse-core/test/chromium-web-tests/download-devtools.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lighthouse-core/test/chromium-web-tests/download-devtools.sh b/lighthouse-core/test/chromium-web-tests/download-devtools.sh index 4c70f97ec10c..df4a72d6fcb0 100644 --- a/lighthouse-core/test/chromium-web-tests/download-devtools.sh +++ b/lighthouse-core/test/chromium-web-tests/download-devtools.sh @@ -16,7 +16,7 @@ then # Update to keep current git clean -fd git pull -f origin master - gclient sync + gclient sync --delete_unversioned_trees --reset exit 0 fi From c1cbc3ecab15a014d7d06697ad5be6542c6511da Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Tue, 8 Dec 2020 14:00:47 -0800 Subject: [PATCH 4/4] Update lighthouse-core/test/chromium-web-tests/download-devtools.sh --- lighthouse-core/test/chromium-web-tests/download-devtools.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lighthouse-core/test/chromium-web-tests/download-devtools.sh b/lighthouse-core/test/chromium-web-tests/download-devtools.sh index df4a72d6fcb0..7555403325b2 100644 --- a/lighthouse-core/test/chromium-web-tests/download-devtools.sh +++ b/lighthouse-core/test/chromium-web-tests/download-devtools.sh @@ -14,6 +14,7 @@ then cd "$DEVTOOLS_PATH" # Update to keep current + git reset --hard git clean -fd git pull -f origin master gclient sync --delete_unversioned_trees --reset