From b934fad92479b30318d070bdc927bb712d4f6baa Mon Sep 17 00:00:00 2001 From: angle-autoroll Date: Mon, 31 Jan 2022 07:02:28 +0000 Subject: [PATCH] Roll Chromium from 4d71de73b37d to 97a33ab1a078 (625 revisions) https://chromium.googlesource.com/chromium/src.git/+log/4d71de73b37d..97a33ab1a078 If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/chromium-angle-autoroll Please CC ynovikov@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Chromium: https://bugs.chromium.org/p/chromium/issues/entry To file a bug in ANGLE: https://bugs.chromium.org/p/angleproject/issues/entry To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Changed dependencies * build: https://chromium.googlesource.com/chromium/src/build.git/+log/c033fc477f..251d3d7d45 * buildtools/third_party/libunwind/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git/+log/7246413309..d0ad43c5e1 * testing: https://chromium.googlesource.com/chromium/src/testing/+log/df87133fcb..91b483090a * third_party/android_deps: https://chromium.googlesource.com/chromium/src/third_party/android_deps/+log/09aa08e993..3d6486f686 * third_party/android_ndk: https://chromium.googlesource.com/android_ndk.git/+log/401019bf85..9644104c8c * third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/{catapult_..6b30850934 * third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/289dedd36b..8dd74d4f85 * tools/perf: https://chromium.googlesource.com/chromium/src/tools/perf/+log/e9331be2f4..4ccc066727 * tools/valgrind: https://chromium.googlesource.com/chromium/src/tools/valgrind/+log/ff9c7dc63d..92807057e1 No update to Clang. Bug: None Tbr: ynovikov@google.com Change-Id: I3620eb6bb4d8bbf2ead0dabd518cb03cea21b7ae Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3426821 Commit-Queue: angle-autoroll Bot-Commit: angle-autoroll --- DEPS | 28 ++++++++-------- infra/specs/angle.json | 32 +++++++++---------- infra/specs/mixins.pyl | 4 +-- .../Test_spec_JSON.json | 6 ++-- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/DEPS b/DEPS index 6733062ea..0e2c3b1fb 100644 --- a/DEPS +++ b/DEPS @@ -34,7 +34,7 @@ vars = { 'checkout_android_native_support': 'checkout_android or checkout_chromeos', # Version of Chromium our Chromium-based DEPS are mirrored from. - 'chromium_revision': '4d71de73b37d8272097885f5430e46ca4d684824', + 'chromium_revision': '97a33ab1a078f5e610fd294057a823bf10572e25', # We never want to checkout chromium, # but need a dummy DEPS entry for the autoroller 'dummy_checkout_chromium': False, @@ -79,7 +79,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling catapult # and whatever else without interference from each other. - 'catapult_revision': 'd90eeee99383928afa92d6960ad9d3b5f51f8b76', + 'catapult_revision': '6b308509348a991ab9185f9af866fd9a1a0ca164', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling luci-go @@ -119,7 +119,7 @@ vars = { deps = { 'build': { - 'url': '{chromium_git}/chromium/src/build.git@c033fc477ff9e5a9513a6df537f6de4ba67eceec', + 'url': '{chromium_git}/chromium/src/build.git@251d3d7d45493918068ef24effb94eedc4b9024e', 'condition': 'not build_with_chromium', }, @@ -166,7 +166,7 @@ deps = { }, 'buildtools/third_party/libunwind/trunk': { - 'url': '{chromium_git}/external/github.com/llvm/llvm-project/libunwind.git@724641330986f2965446587c43b8db641f54c6b8', + 'url': '{chromium_git}/external/github.com/llvm/llvm-project/libunwind.git@d0ad43c5e10e732958f2d5ff4ae0b79f78506fcf', 'condition': 'not build_with_chromium', }, @@ -182,7 +182,7 @@ deps = { }, 'testing': { - 'url': '{chromium_git}/chromium/src/testing@df87133fcb31f773a418c933d372ea7262de95ca', + 'url': '{chromium_git}/chromium/src/testing@91b483090a459823edd982ad9a0ec3e67fec3d9b', 'condition': 'not build_with_chromium', }, @@ -230,12 +230,12 @@ deps = { }, 'third_party/android_deps': { - 'url': '{chromium_git}/chromium/src/third_party/android_deps@09aa08e993b09cdcea1e1eb124f0b444fbce0e56', + 'url': '{chromium_git}/chromium/src/third_party/android_deps@3d6486f6866ea9ab73ae68a87887d7829c2ad5c2', 'condition': 'checkout_android and not build_with_chromium', }, 'third_party/android_ndk': { - 'url': '{chromium_git}/android_ndk.git@401019bf85744311b26c88ced255cd53401af8b7', + 'url': '{chromium_git}/android_ndk.git@9644104c8cf85bf1bdce5b1c0691e9778572c3f8', 'condition': 'checkout_android and not build_with_chromium', }, @@ -332,7 +332,7 @@ deps = { }, 'third_party/depot_tools': { - 'url': '{chromium_git}/chromium/tools/depot_tools.git@289dedd36b188d07a25c5342d9ec06be50dfa670', + 'url': '{chromium_git}/chromium/tools/depot_tools.git@8dd74d4f85a739ff883831960c665b0a3a24ec36', 'condition': 'not build_with_chromium', }, @@ -582,7 +582,7 @@ deps = { }, 'tools/perf': { - 'url': '{chromium_git}/chromium/src/tools/perf@e9331be2f4185ab35affc518e15b09f32ab359ec', + 'url': '{chromium_git}/chromium/src/tools/perf@4ccc066727932b9afffccec7820af2c083a2f34a', 'condition': 'not build_with_chromium', }, @@ -641,7 +641,7 @@ deps = { }, 'tools/valgrind': { - 'url': '{chromium_git}/chromium/src/tools/valgrind@ff9c7dc63d51297fb1d9877df9a50915c1f6c151', + 'url': '{chromium_git}/chromium/src/tools/valgrind@92807057e16a7fa9db688eadf0d4b3d08b817661', 'condition': 'not build_with_chromium', }, @@ -2274,7 +2274,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_tools_common', - 'version': 'version:2@30.0.0-alpha10.cr0', + 'version': 'version:2@30.2.0-beta01.cr0', }, ], 'condition': 'checkout_android and not build_with_chromium', @@ -2307,7 +2307,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_tools_layoutlib_layoutlib_api', - 'version': 'version:2@30.0.0-alpha10.cr0', + 'version': 'version:2@30.2.0-beta01.cr0', }, ], 'condition': 'checkout_android and not build_with_chromium', @@ -2318,7 +2318,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_android_tools_sdk_common', - 'version': 'version:2@30.0.0-alpha10.cr0', + 'version': 'version:2@30.2.0-beta01.cr0', }, ], 'condition': 'checkout_android and not build_with_chromium', @@ -3022,7 +3022,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite', - 'version': 'version:2@3.13.0.cr0', + 'version': 'version:2@3.19.3.cr0', }, ], 'condition': 'checkout_android and not build_with_chromium', diff --git a/infra/specs/angle.json b/infra/specs/angle.json index 6859a2103..7e15cef1b 100644 --- a/infra/specs/angle.json +++ b/infra/specs/angle.json @@ -3595,7 +3595,7 @@ "display_attached": "1", "gpu": "1002:6821", "hidpi": "1", - "os": "Mac-11.4|Mac-12.1", + "os": "Mac-12.1", "pool": "chromium.tests.gpu" } ], @@ -3624,7 +3624,7 @@ "display_attached": "1", "gpu": "1002:6821", "hidpi": "1", - "os": "Mac-11.4|Mac-12.1", + "os": "Mac-12.1", "pool": "chromium.tests.gpu" } ], @@ -3653,7 +3653,7 @@ "display_attached": "1", "gpu": "1002:6821", "hidpi": "1", - "os": "Mac-11.4|Mac-12.1", + "os": "Mac-12.1", "pool": "chromium.tests.gpu" } ], @@ -3682,7 +3682,7 @@ "display_attached": "1", "gpu": "1002:6821", "hidpi": "1", - "os": "Mac-11.4|Mac-12.1", + "os": "Mac-12.1", "pool": "chromium.tests.gpu" } ], @@ -3711,7 +3711,7 @@ "display_attached": "1", "gpu": "1002:6821", "hidpi": "1", - "os": "Mac-11.4|Mac-12.1", + "os": "Mac-12.1", "pool": "chromium.tests.gpu" } ], @@ -3742,7 +3742,7 @@ "display_attached": "1", "gpu": "1002:6821", "hidpi": "1", - "os": "Mac-11.4|Mac-12.1", + "os": "Mac-12.1", "pool": "chromium.tests.gpu" } ], @@ -3773,7 +3773,7 @@ "display_attached": "1", "gpu": "1002:6821", "hidpi": "1", - "os": "Mac-11.4|Mac-12.1", + "os": "Mac-12.1", "pool": "chromium.tests.gpu" } ], @@ -3801,7 +3801,7 @@ "display_attached": "1", "gpu": "1002:6821", "hidpi": "1", - "os": "Mac-11.4|Mac-12.1", + "os": "Mac-12.1", "pool": "chromium.tests.gpu" } ], @@ -3835,7 +3835,7 @@ "display_attached": "1", "gpu": "1002:6821", "hidpi": "1", - "os": "Mac-12.0|Mac-12.1", + "os": "Mac-12.1", "pool": "chromium.tests.gpu" } ], @@ -3864,7 +3864,7 @@ "display_attached": "1", "gpu": "1002:6821", "hidpi": "1", - "os": "Mac-12.0|Mac-12.1", + "os": "Mac-12.1", "pool": "chromium.tests.gpu" } ], @@ -3893,7 +3893,7 @@ "display_attached": "1", "gpu": "1002:6821", "hidpi": "1", - "os": "Mac-12.0|Mac-12.1", + "os": "Mac-12.1", "pool": "chromium.tests.gpu" } ], @@ -3922,7 +3922,7 @@ "display_attached": "1", "gpu": "1002:6821", "hidpi": "1", - "os": "Mac-12.0|Mac-12.1", + "os": "Mac-12.1", "pool": "chromium.tests.gpu" } ], @@ -3951,7 +3951,7 @@ "display_attached": "1", "gpu": "1002:6821", "hidpi": "1", - "os": "Mac-12.0|Mac-12.1", + "os": "Mac-12.1", "pool": "chromium.tests.gpu" } ], @@ -3982,7 +3982,7 @@ "display_attached": "1", "gpu": "1002:6821", "hidpi": "1", - "os": "Mac-12.0|Mac-12.1", + "os": "Mac-12.1", "pool": "chromium.tests.gpu" } ], @@ -4013,7 +4013,7 @@ "display_attached": "1", "gpu": "1002:6821", "hidpi": "1", - "os": "Mac-12.0|Mac-12.1", + "os": "Mac-12.1", "pool": "chromium.tests.gpu" } ], @@ -4041,7 +4041,7 @@ "display_attached": "1", "gpu": "1002:6821", "hidpi": "1", - "os": "Mac-12.0|Mac-12.1", + "os": "Mac-12.1", "pool": "chromium.tests.gpu" } ], diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index 1db4da206..9367afa00 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl @@ -43,13 +43,13 @@ 'display_attached': '1', 'gpu': '1002:6821', 'hidpi': '1', - 'os': 'Mac-12.0|Mac-12.1', + 'os': 'Mac-12.1', 'pool': 'chromium.tests.gpu'}}}, 'mac_retina_amd_gpu_stable': { 'swarming': { 'dimensions': { 'cpu': 'x86-64', 'display_attached': '1', 'gpu': '1002:6821', 'hidpi': '1', - 'os': 'Mac-11.4|Mac-12.1', + 'os': 'Mac-12.1', 'pool': 'chromium.tests.gpu'}}}, 'mac_retina_nvidia_gpu_stable': { 'swarming': { 'dimensions': { 'cpu': 'x86-64', 'display_attached': '1', diff --git a/scripts/code_generation_hashes/Test_spec_JSON.json b/scripts/code_generation_hashes/Test_spec_JSON.json index d30387d7c..fd22c7e2f 100644 --- a/scripts/code_generation_hashes/Test_spec_JSON.json +++ b/scripts/code_generation_hashes/Test_spec_JSON.json @@ -1,10 +1,10 @@ { "infra/specs/angle.json": - "94ff00b4758d1cdcb0a2f9472a80d4ca", + "1c48c382700701f792d6a1ad175ea9f7", "infra/specs/generate_test_spec_json.py": "4be9deb362129fb37eb0ad76ed2d8c11", "infra/specs/mixins.pyl": - "69ae4f86bedbb469bc13c330a007bd89", + "00b19473ccc81795461a8a0605af7c3d", "infra/specs/test_suite_exceptions.pyl": "723460da84a90884a9668c07a0893390", "infra/specs/test_suites.pyl": @@ -16,5 +16,5 @@ "testing/buildbot/generate_buildbot_json.py": "5763d784daa2ce2738e7fdb56623230c", "testing/buildbot/mixins.pyl": - "65dc51b541da8cf365065d7533deaab4" + "b7113c8b227b8219d7fe900a59cea7ea" } \ No newline at end of file