diff --git a/DEPS b/DEPS index d2836495c..da4ddbd9f 100644 --- a/DEPS +++ b/DEPS @@ -43,7 +43,7 @@ vars = { 'checkout_angle_mesa': False, # Version of Chromium our Chromium-based DEPS are mirrored from. - 'chromium_revision': '2c9d51705f3b152505ea4efb5a780043fc0f4f12', + 'chromium_revision': '54894332d13c39384560368c1bd528cc8d45eedd', # We never want to checkout chromium, # but need a dummy DEPS entry for the autoroller 'dummy_checkout_chromium': False, @@ -92,7 +92,7 @@ vars = { # the commit queue can handle CLs rolling Fuchsia sdk # and whatever else without interference from each other. - 'fuchsia_version': 'version:10.20221116.3.1', + 'fuchsia_version': 'version:10.20221117.0.1', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling luci-go @@ -136,7 +136,7 @@ vars = { deps = { 'build': { - 'url': '{chromium_git}/chromium/src/build.git@a6b135f6dcc5316c27a25d182fbe500efc101110', + 'url': '{chromium_git}/chromium/src/build.git@316bdbb4f87652d29d92d2b925cd9f0b86746dc6', 'condition': 'not build_with_chromium', }, @@ -199,7 +199,7 @@ deps = { }, 'testing': { - 'url': '{chromium_git}/chromium/src/testing@1f8966e6e2a664332546bd46212db9ddabcc7433', + 'url': '{chromium_git}/chromium/src/testing@fd493f4659e1a942a24ffa60719de1d6b5de3f77', 'condition': 'not build_with_chromium', }, @@ -284,7 +284,7 @@ deps = { }, 'third_party/android_sdk': { - 'url': '{chromium_git}/chromium/src/third_party/android_sdk@3f159e715e9198d3f7e6a585970a53e61ea985ed', + 'url': '{chromium_git}/chromium/src/third_party/android_sdk@c5a3f52f058741d1eba0334c908ccb9fd49c76fc', 'condition': 'checkout_android and not build_with_chromium', }, @@ -372,7 +372,7 @@ deps = { }, 'third_party/depot_tools': { - 'url': '{chromium_git}/chromium/tools/depot_tools.git@fadcbfdb279278e98a598f5384d2d29ac01fb8d1', + 'url': '{chromium_git}/chromium/tools/depot_tools.git@1f67d5573f9cc19bc7fd52b0295687164cc979d6', 'condition': 'not build_with_chromium', }, @@ -650,7 +650,7 @@ deps = { }, 'tools/clang': { - 'url': '{chromium_git}/chromium/src/tools/clang.git@eea11ec5d26fafa408ba7431f22f249608e90712', + 'url': '{chromium_git}/chromium/src/tools/clang.git@d21aa5eb7e92726fd695bea94aa213ccb52b30d1', 'condition': 'not build_with_chromium', }, @@ -681,7 +681,7 @@ deps = { }, 'tools/mb': { - 'url': '{chromium_git}/chromium/src/tools/mb@9d3a5eb0dd1006c1d9589e4f814c19674f5f7031', + 'url': '{chromium_git}/chromium/src/tools/mb@4fc30da87810ff32db08d844f3928315b1403057', 'condition': 'not build_with_chromium', }, @@ -696,7 +696,7 @@ deps = { }, 'tools/perf': { - 'url': '{chromium_git}/chromium/src/tools/perf@d90015280811c527439789113ad72b04f1623988', + 'url': '{chromium_git}/chromium/src/tools/perf@35428c527a8176e844cb21f5782685dfc0c10ab8', 'condition': 'not build_with_chromium', }, diff --git a/infra/specs/angle.json b/infra/specs/angle.json index 8098ba16c..b37dcfd00 100644 --- a/infra/specs/angle.json +++ b/infra/specs/angle.json @@ -3992,7 +3992,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-12.4|Mac-12.5" + "os": "Mac-12.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -4017,7 +4017,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-12.4|Mac-12.5" + "os": "Mac-12.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -4043,7 +4043,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-12.4|Mac-12.5" + "os": "Mac-12.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -4068,7 +4068,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-12.4|Mac-12.5" + "os": "Mac-12.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" @@ -4094,7 +4094,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-12.4|Mac-12.5" + "os": "Mac-12.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -4121,7 +4121,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-12.4|Mac-12.5" + "os": "Mac-12.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -4148,7 +4148,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-12.4|Mac-12.5" + "os": "Mac-12.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", @@ -4171,7 +4171,7 @@ "cpu": "x86-64", "display_attached": "1", "gpu": "8086:3e9b", - "os": "Mac-12.4|Mac-12.5" + "os": "Mac-12.5" } ], "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl index 78fc58f3c..6748bd716 100644 --- a/infra/specs/mixins.pyl +++ b/infra/specs/mixins.pyl @@ -41,7 +41,7 @@ 'mac_mini_intel_gpu_stable': { 'swarming': { 'dimensions': { 'cpu': 'x86-64', 'display_attached': '1', 'gpu': '8086:3e9b', - 'os': 'Mac-12.4|Mac-12.5'}}}, + 'os': 'Mac-12.5'}}}, 'mac_retina_amd_gpu_stable': { 'swarming': { 'dimensions': { 'cpu': 'x86-64', 'display_attached': '1', 'gpu': '1002:6821', diff --git a/scripts/code_generation_hashes/Test_spec_JSON.json b/scripts/code_generation_hashes/Test_spec_JSON.json index 56df2d84f..b0d36611b 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": - "ed2a15b99f1734f489c3f3a8738b8eb9", + "ad5ae719e30c3ae59dea4b11dfa86d12", "infra/specs/generate_test_spec_json.py": "55db0ebf31449241041560f53752d3fb", "infra/specs/mixins.pyl": - "bb2a869686838a80b481ad0659726343", + "932aefa8470a97a6449825c384f5e124", "infra/specs/test_suite_exceptions.pyl": "ddaa1f7aa474e576f78740dba0d9c347", "infra/specs/test_suites.pyl": @@ -16,5 +16,5 @@ "testing/buildbot/generate_buildbot_json.py": "732df88383134cd50f81b1ca600b871a", "testing/buildbot/mixins.pyl": - "6a8fedece163baf01c5a4aefe64c628a" + "383358a1d02353ae7847aae7666883a2" } \ No newline at end of file