Skip to content

Commit 7727db8

Browse files
authored
Merge pull request #144 from huntie/repo-sync
2 parents 486803f + 5327e4d commit 7727db8

File tree

5,027 files changed

+522377
-842982
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

5,027 files changed

+522377
-842982
lines changed

.gitallowed

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# This key is expected to be visible in the frontend code
2+
# b/349721878
3+
CRUX_API_KEY
4+

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
with:
3737
name: dist-Release-front_end
3838
path: src/out/Release/gen/front_end
39-
- name: Run unit tests
39+
- name: Run front_end tests
4040
run: |
4141
cd src
42-
npm run unittest -- --expanded-reporting
42+
npm run test -- front_end

.npmrc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
11
# `npm run install-deps` depends on this particular setting.
22
package-lock = true
3+
# match settings used by `npm run install-deps`.
4+
omit = optional # This is to avoid downloading esbuild-* package.
5+
ignore-scripts = true
6+
save-exact = true
7+
save-dev = true # Only devDependencies are allowed.
8+
prefer-online = true # To consult the mirror instead of local cache.
9+
# See go/sk-npm-audit-mirror.
10+
registry = https://npm.skia.org/chrome-devtools

.vscode/devtools-workspace-launch.json

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,55 @@
77
"name": "Run unit tests in VS Code debugger",
88
"preLaunchTask": "1-build_Debug",
99
"runtimeExecutable": "/usr/bin/npm",
10-
"runtimeArgs": ["run", "unittest"],
10+
"runtimeArgs": [
11+
"run",
12+
"test",
13+
"front_end"
14+
],
1115
"port": 7722,
1216
"timeout": 30000,
1317
"browserLaunchLocation": "workspace",
1418
"outputCapture": "std",
15-
"trace": true,
16-
"env" : {
17-
"KARMA_TIMEOUT": "3600000"
18-
}
19+
"trace": true
1920
},
2021
{
2122
"type": "pwa-node",
2223
"request": "launch",
2324
"name": "Run end-to-end tests in VS Code debugger",
2425
"preLaunchTask": "1-build_Debug",
2526
"runtimeExecutable": "/usr/bin/npm",
26-
"runtimeArgs": ["run", "e2etest"]
27+
"runtimeArgs": [
28+
"run",
29+
"test",
30+
"test/e2e"
31+
]
32+
},
33+
{
34+
"type": "pwa-node",
35+
"request": "launch",
36+
"name": "Run test",
37+
"cwd": "${workspaceFolder}",
38+
"runtimeExecutable": "/usr/bin/npm",
39+
"runtimeArgs": [
40+
"run",
41+
"test",
42+
"--",
43+
"${file}"
44+
]
45+
},
46+
{
47+
"type": "pwa-node",
48+
"request": "launch",
49+
"name": "Debug test",
50+
"cwd": "${workspaceFolder}",
51+
"runtimeExecutable": "/usr/bin/npm",
52+
"runtimeArgs": [
53+
"run",
54+
"test",
55+
"--",
56+
"--debug",
57+
"${file}"
58+
]
2759
}
2860
]
2961
}

AUTHORS

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Daniel bellfield <[email protected]>
2727
Danny Eldridge <[email protected]>
2828
2929
Douglas Chiang <[email protected]>
30+
Dragonish <[email protected]>
3031
Edward Trist <[email protected]>
3132
Ergün Erdoğmuş <[email protected]>
3233
Eric Rannaud <[email protected]>
@@ -42,12 +43,14 @@ Jake Mulhern <[email protected]>
4243
Jan Keitel <[email protected]>
4344
Jeffrey Chen <[email protected]>
4445
Jesper van den Ende <[email protected]>
46+
Jerome Vouillon <[email protected]>
4547
Juba Borgohain <[email protected]>
4648
Julian Geppert <[email protected]>
4749
Junseo Yoo <[email protected]>
4850
Karntino Areros <[email protected]>
4951
Kohei Ueno <[email protected]>
5052
Krishnal Ciccolella <[email protected]>
53+
Liam DeBeasi <[email protected]>
5154
Luke Swiderski <[email protected]>
5255
Luke Warlow <[email protected]>
5356
Marijn Haverbeke <[email protected]>
@@ -60,16 +63,17 @@ Paul Fisher <[email protected]>
6063
Per-Olov Jernberg <[email protected]>
6164
6265
Pradhuman Singh Baid <[email protected]>
63-
Punith B Nayak <[email protected]>
6466
Rahat Muneeb <[email protected]>
6567
Rahul B S <[email protected]>
6668
Rajasekar Murugan <[email protected]>
6769
Ross Wollman <[email protected]>
6870
Royi Hagigi <[email protected]>
6971
Ryan Puhalovich <[email protected]>
72+
Sebastian Markbåge <[email protected]>
7073
Serg Kryvonos <[email protected]>
7174
Simon Siefke <[email protected]>
7275
Stephen Tsoi-A-Sue <[email protected]>
76+
Thomas Stokes <[email protected]>
7377
Tony Kostowny <[email protected]>
7478
Toshiaki Tanaka <[email protected]>
7579
Tushar Singh <[email protected]>

DEPS

Lines changed: 27 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -12,45 +12,51 @@ vars = {
1212
'build_with_chromium': False,
1313

1414
'build_url': 'https://chromium.googlesource.com/chromium/src/build.git',
15-
'build_revision': '253f9e7fd541bc035d81d794a8fe206b1a0720f6',
15+
'build_revision': '7a8285c06acd753e6228263f48e5595e20ca1577',
1616

1717
'buildtools_url': 'https://chromium.googlesource.com/chromium/src/buildtools.git',
18-
'buildtools_revision': '9491ff1efcb98797b3989a454c3bb721272689e5',
18+
'buildtools_revision': '3ef44a2b92d5dd1faa5189a06f3a5febe6db2d58',
1919

2020
'depot_tools_url': 'https://chromium.googlesource.com/chromium/tools/depot_tools.git',
21-
'depot_tools_revision': 'de6a9a9692db6667df3b7f972bcead57d6154e9f',
21+
'depot_tools_revision': 'cba7859885743d3c9865e4f1c076a6f2b698932d',
2222

2323
'inspector_protocol_url': 'https://chromium.googlesource.com/deps/inspector_protocol',
24-
'inspector_protocol_revision': '916f43c554c65ebf4ccd896b0f4e2ac99a67c434',
24+
'inspector_protocol_revision': '2915acabcf62efd7257c57bb8a443a7c389c65cb',
25+
26+
# Keeping track of the last time we rollerd the browser protocol files.
27+
'chromium_browser_protocol_revision' : 'a51d9c64b04a596df7ca3a57a88d5427746fcda2',
2528

2629
'clang_format_url': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git',
27-
'clang_format_revision': 'e5337933f2951cacd3aeacd238ce4578163ca0b9',
30+
'clang_format_revision': '3c0acd2d4e73dd911309d9e970ba09d58bf23a62',
2831

2932
'emscripten_tag': 'ade9d780ff17c88d81aa13860361743e3c1e1396',
3033

3134
# GN CIPD package version.
32-
'gn_version': 'git_revision:88e8054aff7bd0cb2295c7d9361d2be0b7355f27',
35+
'gn_version': 'git_revision:b2afae122eeb6ce09c52d63f67dc53fc517dbdc8',
3336

34-
'cmake_version': 'version:3.16.1',
37+
'cmake_version': 'version:[email protected]',
3538

3639
'llvm_url': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/',
37-
'llvm_revision': 'c08d3b08f6d71e974537de226c68d4c94c396a46',
40+
'llvm_revision': '3c51ea3619e488db19cd26840ed46d58cfc7062f',
3841

3942
'lldb_eval_url': 'https://chromium.googlesource.com/external/github.com/google/lldb-eval.git',
4043
'lldb_eval_revision': 'e87123a7e639bf1d86f24c37079570fb7fa00b72',
4144

4245
# ninja CIPD package version.
43-
# https://chrome-infra-packages.appspot.com/p/infra/3pp/tools/ninja
44-
'ninja_version': 'version:[email protected].6',
46+
# https://chrome-infra-packages.appspot.com/p/infra/3pp/build_support/ninja-1_11_1/
47+
'ninja_version': 'version:[email protected].2',
4548

4649
# Chrome version used for tests. It should be regularly updated to
4750
# match the Canary version listed here:
4851
# https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions.json
49-
'chrome': '124.0.6339.0',
52+
'chrome': '128.0.6611.0',
5053

5154
# 'magic' text to tell depot_tools that git submodules should be accepted but
5255
# but parity with DEPS file is expected.
53-
'SUBMODULE_MIGRATION': 'True'
56+
'SUBMODULE_MIGRATION': 'True',
57+
58+
# condition to allowlist deps for non-git-source processing.
59+
'non_git_source': 'True',
5460
}
5561

5662
# Only these hosts are allowed for dependencies in this DEPS file.
@@ -64,7 +70,7 @@ deps = {
6470
},
6571
'third_party/cmake': {
6672
'packages': [{
67-
'package': 'infra/cmake/${{platform}}',
73+
'package': 'infra/3pp/tools/cmake/${{platform}}',
6874
'version': Var('cmake_version')
6975
}],
7076
'dep_type':
@@ -108,7 +114,7 @@ deps = {
108114
'buildtools/win': {
109115
'packages': [
110116
{
111-
'package': 'gn/gn/windows-${{arch}}',
117+
'package': 'gn/gn/windows-amd64',
112118
'version': Var('gn_version'),
113119
}
114120
],
@@ -123,6 +129,7 @@ deps = {
123129
}
124130
],
125131
'dep_type': 'cipd',
132+
'condition': 'non_git_source',
126133
},
127134

128135
'build': {
@@ -140,7 +147,7 @@ deps = {
140147
'third_party/ninja': {
141148
'packages': [
142149
{
143-
'package': 'infra/3pp/tools/ninja/${{platform}}',
150+
'package': 'infra/3pp/build_support/ninja-1_11_1/${{platform}}',
144151
'version': Var('ninja_version'),
145152
}
146153
],
@@ -216,58 +223,6 @@ hooks = [
216223
],
217224
},
218225

219-
# Pull clang-format binaries using checked-in hashes.
220-
{
221-
'name': 'clang_format_win',
222-
'pattern': '.',
223-
'condition': 'host_os == "win" and build_with_chromium == False',
224-
'action': [ 'python3',
225-
'third_party/depot_tools/download_from_google_storage.py',
226-
'--no_resume',
227-
'--no_auth',
228-
'--bucket', 'chromium-clang-format',
229-
'-s', 'buildtools/win/clang-format.exe.sha1',
230-
],
231-
},
232-
{
233-
'name': 'clang_format_mac_x64',
234-
'pattern': '.',
235-
'condition': 'host_os == "mac" and build_with_chromium == False and host_cpu == "x64"',
236-
'action': [ 'python3',
237-
'third_party/depot_tools/download_from_google_storage.py',
238-
'--no_resume',
239-
'--no_auth',
240-
'--bucket', 'chromium-clang-format',
241-
'-s', 'buildtools/mac/clang-format.x64.sha1',
242-
'-o', 'buildtools/mac/clang-format',
243-
],
244-
},
245-
{
246-
'name': 'clang_format_mac_arm64',
247-
'pattern': '.',
248-
'condition': 'host_os == "mac" and build_with_chromium == False and host_cpu == "arm64"',
249-
'action': [ 'python3',
250-
'third_party/depot_tools/download_from_google_storage.py',
251-
'--no_resume',
252-
'--no_auth',
253-
'--bucket', 'chromium-clang-format',
254-
'-s', 'buildtools/mac/clang-format.arm64.sha1',
255-
'-o', 'buildtools/mac/clang-format',
256-
],
257-
},
258-
{
259-
'name': 'clang_format_linux',
260-
'pattern': '.',
261-
'condition': 'host_os == "linux" and build_with_chromium == False',
262-
'action': [ 'python3',
263-
'third_party/depot_tools/download_from_google_storage.py',
264-
'--no_resume',
265-
'--no_auth',
266-
'--bucket', 'chromium-clang-format',
267-
'-s', 'buildtools/linux64/clang-format.sha1',
268-
],
269-
},
270-
271226
# Pull Chrome binaries from CfT buckets.
272227
{
273228
'name': 'download_chrome_win',
@@ -334,13 +289,6 @@ hooks = [
334289
'action': ['python3', 'build/util/lastchange.py',
335290
'-o', 'build/util/LASTCHANGE'],
336291
},
337-
{
338-
'name': 'sysroot_x64',
339-
'pattern': '.',
340-
'condition': 'checkout_linux and checkout_x64 and build_with_chromium == False',
341-
'action': ['python3', 'build/linux/sysroot_scripts/install-sysroot.py',
342-
'--arch=x64'],
343-
},
344292
{
345293
'name': 'emscripten',
346294
'pattern': '.',
@@ -354,3 +302,8 @@ hooks = [
354302
'action': ['python3', 'third_party/node/node.py', '--output', 'scripts/deps/sync-vscode-settings.js']
355303
},
356304
]
305+
306+
recursedeps = [
307+
'build',
308+
'buildtools',
309+
]

0 commit comments

Comments
 (0)