OLD | NEW |
1 <!-- Copyright 2015 The Chromium Authors. All rights reserved. | 1 <!-- Copyright 2015 The Chromium Authors. All rights reserved. |
2 Use of this source code is governed by a BSD-style license that can be | 2 Use of this source code is governed by a BSD-style license that can be |
3 found in the LICENSE file. | 3 found in the LICENSE file. |
4 --> | 4 --> |
5 # Code of Conduct | 5 # Code of Conduct |
6 | 6 |
7 We follow the [Chromium code of conduct]( | 7 We follow the [Chromium code of conduct]( |
8 https://chromium.googlesource.com/chromium/src/+/master/CODE_OF_CONDUCT.md) in | 8 https://chromium.googlesource.com/chromium/src/+/master/CODE_OF_CONDUCT.md) in |
9 our our repos and organizations, mailing lists, and other communications. | 9 our our repos and organizations, mailing lists, and other communications. |
10 | 10 |
(...skipping 10 matching lines...) Expand all Loading... |
21 | 21 |
22 ``` | 22 ``` |
23 cd catapult | 23 cd catapult |
24 git checkout -t -b foo origin/master | 24 git checkout -t -b foo origin/master |
25 ... edit files ... | 25 ... edit files ... |
26 git commit -a -m "New files" | 26 git commit -a -m "New files" |
27 ``` | 27 ``` |
28 | 28 |
29 Once you're ready for a review do: | 29 Once you're ready for a review do: |
30 | 30 |
31 `git cl upload --rietveld` | 31 `git cl upload` |
32 | 32 |
33 Once uploaded you can view the CL in Rietveld and **request a review** by | 33 Once uploaded you can view the CL in Gerrit and **request a review** by |
34 clicking the 'publish & mail' link, and adding a reviewer from the | 34 clicking the "Add reviewer" link, and adding a reviewer from the |
35 [OWNERS](/OWNERS) file. You can also click the "CQ Dry Run" link to run all | 35 [OWNERS](/OWNERS) file. You can also click the "CQ Dry Run" button to run all |
36 the tests on your change. | 36 the tests on your change. |
37 | 37 |
38 If you get review feedback, edit and commit locally and then do another upload | 38 If you get review feedback, edit and commit locally and then do another upload |
39 with the new files. Before you commit you'll want to sync to the tip-of-tree. | 39 with the new files. Before you commit you'll want to sync to the tip-of-tree. |
40 You can either merge or rebase, it's up to you. | 40 You can either merge or rebase, it's up to you. |
41 | 41 |
42 Then, submit your changes through the commit queue by checking the "Commit" box. | 42 Then, submit your changes through the commit queue by checking the "Commit" box. |
43 | 43 |
44 Once everything is landed, you can cleanup your branch. | 44 Once everything is landed, you can cleanup your branch. |
45 | 45 |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 * [perf dashboard](/dashboard/README.md) | 97 * [perf dashboard](/dashboard/README.md) |
98 * [systrace](/systrace/README.md) | 98 * [systrace](/systrace/README.md) |
99 * [telemetry](/telemetry/README.md) | 99 * [telemetry](/telemetry/README.md) |
100 * [trace-viewer](/tracing/README.md) | 100 * [trace-viewer](/tracing/README.md) |
101 | 101 |
102 # Tests | 102 # Tests |
103 | 103 |
104 Check individual project documentation for instructions on how to run tests. | 104 Check individual project documentation for instructions on how to run tests. |
105 You can also check the current status of our tests on the | 105 You can also check the current status of our tests on the |
106 [waterfall](http://build.chromium.org/p/client.catapult/waterfall). | 106 [waterfall](http://build.chromium.org/p/client.catapult/waterfall). |
107 Use the "commit" checkbox in rietveld to commit through the commit queue, which | 107 Use the "Submit to CQ" button in Gerrit to commit through the commit queue, |
108 automatically runs all tests. Run the tests before committing with the | 108 which automatically runs all tests. Run the tests before committing with the |
109 "CQ dry run" link. | 109 "CQ Dry Run" button. |
110 | 110 |
111 # Updating Chromium's about:tracing (rolling DEPS) | 111 # Updating Chromium's about:tracing (rolling DEPS) |
112 | 112 |
113 Chromium's DEPS file needs to be rolled to the catapult revision containing your | 113 Chromium's DEPS file needs to be rolled to the catapult revision containing your |
114 change in order for it to appear in Chrome's about:tracing or other | 114 change in order for it to appear in Chrome's about:tracing or other |
115 third_party/catapult files. Follow the [directions for rolling DEPS](/docs/rolli
ng-deps.md) | 115 third_party/catapult files. Follow the [directions for rolling DEPS](/docs/rolli
ng-deps.md) |
116 to do this. | 116 to do this. |
117 | 117 |
118 # Adding a new project | 118 # Adding a new project |
119 | 119 |
120 Please read the [directory structure guide](/docs/directory-structure.md) | 120 Please read the [directory structure guide](/docs/directory-structure.md) |
121 to learn the conventions for new directories. | 121 to learn the conventions for new directories. |
OLD | NEW |