Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 1 | #!/usr/bin/env python |
| 2 | # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. |
| 3 | # |
| 4 | # Use of this source code is governed by a BSD-style license |
| 5 | # that can be found in the LICENSE file in the root of the source |
| 6 | # tree. An additional intellectual property rights grant can be found |
| 7 | # in the file PATENTS. All contributing project authors may |
| 8 | # be found in the AUTHORS file in the root of the source tree. |
| 9 | |
Henrik Kjellander | 24db179 | 2016-12-15 10:20:10 +0100 | [diff] [blame] | 10 | """Script to automatically roll dependencies in the WebRTC DEPS file.""" |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 11 | |
| 12 | import argparse |
| 13 | import base64 |
| 14 | import collections |
| 15 | import logging |
| 16 | import os |
| 17 | import re |
| 18 | import subprocess |
| 19 | import sys |
Oleh Prypin | 7f6af7a | 2017-11-01 21:59:32 +0100 | [diff] [blame] | 20 | import urllib2 |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 21 | |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 22 | # Skip these dependencies (list without solution name prefix). |
| 23 | DONT_AUTOROLL_THESE = [ |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 24 | 'src/examples/androidtests/third_party/gradle', |
Artem Titov | 5bb1511 | 2018-05-23 10:08:51 +0200 | [diff] [blame] | 25 | 'src/third_party/ffmpeg', |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 26 | ] |
| 27 | |
ehmaldonado | 4d46a5e | 2017-08-10 15:32:02 -0700 | [diff] [blame] | 28 | # Run these CQ trybots in addition to the default ones in infra/config/cq.cfg. |
| 29 | EXTRA_TRYBOTS = ( |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 30 | 'master.internal.tryserver.corp.webrtc:linux_internal' |
ehmaldonado | 4d46a5e | 2017-08-10 15:32:02 -0700 | [diff] [blame] | 31 | ) |
| 32 | |
Aaron Gable | 2db9c28 | 2017-09-13 11:59:45 -0700 | [diff] [blame] | 33 | WEBRTC_URL = 'https://webrtc.googlesource.com/src' |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 34 | CHROMIUM_SRC_URL = 'https://chromium.googlesource.com/chromium/src' |
| 35 | CHROMIUM_COMMIT_TEMPLATE = CHROMIUM_SRC_URL + '/+/%s' |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 36 | CHROMIUM_LOG_TEMPLATE = CHROMIUM_SRC_URL + '/+log/%s' |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 37 | CHROMIUM_FILE_TEMPLATE = CHROMIUM_SRC_URL + '/+/%s/%s' |
| 38 | |
| 39 | COMMIT_POSITION_RE = re.compile('^Cr-Commit-Position: .*#([0-9]+).*$') |
kjellander | 3860c7f | 2016-01-19 02:04:41 -0800 | [diff] [blame] | 40 | CLANG_REVISION_RE = re.compile(r'^CLANG_REVISION = \'(\d+)\'$') |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 41 | ROLL_BRANCH_NAME = 'roll_chromium_revision' |
| 42 | |
| 43 | SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 44 | CHECKOUT_SRC_DIR = os.path.realpath(os.path.join(SCRIPT_DIR, os.pardir, |
| 45 | os.pardir)) |
| 46 | CHECKOUT_ROOT_DIR = os.path.realpath(os.path.join(CHECKOUT_SRC_DIR, os.pardir)) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 47 | |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 48 | sys.path.append(os.path.join(CHECKOUT_SRC_DIR, 'build')) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 49 | import find_depot_tools |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 50 | |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 51 | find_depot_tools.add_depot_tools_to_path() |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 52 | |
kjellander | 917ba52 | 2015-12-03 00:00:07 -0800 | [diff] [blame] | 53 | CLANG_UPDATE_SCRIPT_URL_PATH = 'tools/clang/scripts/update.py' |
kjellander@webrtc.org | 177567c | 2016-12-22 10:40:28 +0100 | [diff] [blame] | 54 | CLANG_UPDATE_SCRIPT_LOCAL_PATH = os.path.join(CHECKOUT_SRC_DIR, 'tools', |
| 55 | 'clang', 'scripts', 'update.py') |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 56 | |
| 57 | DepsEntry = collections.namedtuple('DepsEntry', 'path url revision') |
Oleh Prypin | 4775b27 | 2018-04-26 22:33:26 +0200 | [diff] [blame] | 58 | ChangedDep = collections.namedtuple( |
| 59 | 'ChangedDep', 'path url current_rev new_rev') |
| 60 | CipdDepsEntry = collections.namedtuple('CipdDepsEntry', 'path packages') |
| 61 | ChangedCipdPackage = collections.namedtuple( |
| 62 | 'ChangedCipdPackage', 'path package current_version new_version') |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 63 | |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 64 | ChromiumRevisionUpdate = collections.namedtuple('ChromiumRevisionUpdate', |
| 65 | ('current_chromium_rev ' |
Artem Titov | 42f0d78 | 2018-06-27 13:23:17 +0200 | [diff] [blame] | 66 | 'new_chromium_rev ')) |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 67 | |
| 68 | |
kjellander | 3860c7f | 2016-01-19 02:04:41 -0800 | [diff] [blame] | 69 | class RollError(Exception): |
| 70 | pass |
| 71 | |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 72 | |
oprypin | 1e64cfa | 2017-07-25 01:57:17 -0700 | [diff] [blame] | 73 | def VarLookup(local_scope): |
| 74 | return lambda var_name: local_scope['vars'][var_name] |
| 75 | |
| 76 | |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 77 | def ParseDepsDict(deps_content): |
| 78 | local_scope = {} |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 79 | global_scope = { |
oprypin | 1e64cfa | 2017-07-25 01:57:17 -0700 | [diff] [blame] | 80 | 'Var': VarLookup(local_scope), |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 81 | 'deps_os': {}, |
| 82 | } |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 83 | exec (deps_content, global_scope, local_scope) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 84 | return local_scope |
| 85 | |
| 86 | |
| 87 | def ParseLocalDepsFile(filename): |
| 88 | with open(filename, 'rb') as f: |
| 89 | deps_content = f.read() |
| 90 | return ParseDepsDict(deps_content) |
| 91 | |
| 92 | |
| 93 | def ParseRemoteCrDepsFile(revision): |
| 94 | deps_content = ReadRemoteCrFile('DEPS', revision) |
| 95 | return ParseDepsDict(deps_content) |
| 96 | |
| 97 | |
| 98 | def ParseCommitPosition(commit_message): |
| 99 | for line in reversed(commit_message.splitlines()): |
| 100 | m = COMMIT_POSITION_RE.match(line.strip()) |
| 101 | if m: |
Oleh Prypin | 16b2a36 | 2017-12-27 21:03:55 +0100 | [diff] [blame] | 102 | return int(m.group(1)) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 103 | logging.error('Failed to parse commit position id from:\n%s\n', |
| 104 | commit_message) |
| 105 | sys.exit(-1) |
| 106 | |
| 107 | |
| 108 | def _RunCommand(command, working_dir=None, ignore_exit_code=False, |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 109 | extra_env=None, input_data=None): |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 110 | """Runs a command and returns the output from that command. |
| 111 | |
| 112 | If the command fails (exit code != 0), the function will exit the process. |
| 113 | |
| 114 | Returns: |
| 115 | A tuple containing the stdout and stderr outputs as strings. |
| 116 | """ |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 117 | working_dir = working_dir or CHECKOUT_SRC_DIR |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 118 | logging.debug('CMD: %s CWD: %s', ' '.join(command), working_dir) |
| 119 | env = os.environ.copy() |
| 120 | if extra_env: |
Artem Titov | 81f5197 | 2018-06-27 10:31:23 +0200 | [diff] [blame] | 121 | assert all(isinstance(value, str) for value in extra_env.values()) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 122 | logging.debug('extra env: %s', extra_env) |
| 123 | env.update(extra_env) |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 124 | p = subprocess.Popen(command, |
| 125 | stdin=subprocess.PIPE, |
| 126 | stdout=subprocess.PIPE, |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 127 | stderr=subprocess.PIPE, env=env, |
| 128 | cwd=working_dir, universal_newlines=True) |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 129 | std_output, err_output = p.communicate(input_data) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 130 | p.stdout.close() |
| 131 | p.stderr.close() |
| 132 | if not ignore_exit_code and p.returncode != 0: |
| 133 | logging.error('Command failed: %s\n' |
| 134 | 'stdout:\n%s\n' |
| 135 | 'stderr:\n%s\n', ' '.join(command), std_output, err_output) |
| 136 | sys.exit(p.returncode) |
| 137 | return std_output, err_output |
| 138 | |
| 139 | |
| 140 | def _GetBranches(): |
| 141 | """Returns a tuple of active,branches. |
| 142 | |
| 143 | The 'active' is the name of the currently active branch and 'branches' is a |
| 144 | list of all branches. |
| 145 | """ |
| 146 | lines = _RunCommand(['git', 'branch'])[0].split('\n') |
| 147 | branches = [] |
| 148 | active = '' |
| 149 | for line in lines: |
| 150 | if '*' in line: |
| 151 | # The assumption is that the first char will always be the '*'. |
| 152 | active = line[1:].strip() |
| 153 | branches.append(active) |
| 154 | else: |
| 155 | branch = line.strip() |
| 156 | if branch: |
| 157 | branches.append(branch) |
| 158 | return active, branches |
| 159 | |
| 160 | |
| 161 | def _ReadGitilesContent(url): |
| 162 | # Download and decode BASE64 content until |
| 163 | # https://code.google.com/p/gitiles/issues/detail?id=7 is fixed. |
| 164 | base64_content = ReadUrlContent(url + '?format=TEXT') |
| 165 | return base64.b64decode(base64_content[0]) |
| 166 | |
| 167 | |
| 168 | def ReadRemoteCrFile(path_below_src, revision): |
| 169 | """Reads a remote Chromium file of a specific revision. Returns a string.""" |
| 170 | return _ReadGitilesContent(CHROMIUM_FILE_TEMPLATE % (revision, |
| 171 | path_below_src)) |
| 172 | |
| 173 | |
| 174 | def ReadRemoteCrCommit(revision): |
| 175 | """Reads a remote Chromium commit message. Returns a string.""" |
| 176 | return _ReadGitilesContent(CHROMIUM_COMMIT_TEMPLATE % revision) |
| 177 | |
| 178 | |
| 179 | def ReadUrlContent(url): |
| 180 | """Connect to a remote host and read the contents. Returns a list of lines.""" |
Oleh Prypin | 7f6af7a | 2017-11-01 21:59:32 +0100 | [diff] [blame] | 181 | conn = urllib2.urlopen(url) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 182 | try: |
| 183 | return conn.readlines() |
| 184 | except IOError as e: |
| 185 | logging.exception('Error connecting to %s. Error: %s', url, e) |
| 186 | raise |
| 187 | finally: |
| 188 | conn.close() |
| 189 | |
| 190 | |
| 191 | def GetMatchingDepsEntries(depsentry_dict, dir_path): |
| 192 | """Gets all deps entries matching the provided path. |
| 193 | |
| 194 | This list may contain more than one DepsEntry object. |
| 195 | Example: dir_path='src/testing' would give results containing both |
| 196 | 'src/testing/gtest' and 'src/testing/gmock' deps entries for Chromium's DEPS. |
| 197 | Example 2: dir_path='src/build' should return 'src/build' but not |
| 198 | 'src/buildtools'. |
| 199 | |
| 200 | Returns: |
| 201 | A list of DepsEntry objects. |
| 202 | """ |
| 203 | result = [] |
| 204 | for path, depsentry in depsentry_dict.iteritems(): |
| 205 | if path == dir_path: |
| 206 | result.append(depsentry) |
| 207 | else: |
Henrik Kjellander | 14771ac | 2015-06-02 13:10:04 +0200 | [diff] [blame] | 208 | parts = path.split('/') |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 209 | if all(part == parts[i] |
Henrik Kjellander | 14771ac | 2015-06-02 13:10:04 +0200 | [diff] [blame] | 210 | for i, part in enumerate(dir_path.split('/'))): |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 211 | result.append(depsentry) |
| 212 | return result |
| 213 | |
| 214 | |
| 215 | def BuildDepsentryDict(deps_dict): |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 216 | """Builds a dict of paths to DepsEntry objects from a raw parsed deps dict.""" |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 217 | result = {} |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 218 | |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 219 | def AddDepsEntries(deps_subdict): |
Oleh Prypin | 6e9c00f | 2018-02-19 16:24:19 +0100 | [diff] [blame] | 220 | for path, dep in deps_subdict.iteritems(): |
Oleh Prypin | 4775b27 | 2018-04-26 22:33:26 +0200 | [diff] [blame] | 221 | if path in result: |
| 222 | continue |
| 223 | if not isinstance(dep, dict): |
| 224 | dep = {'url': dep} |
| 225 | if dep.get('dep_type') == 'cipd': |
| 226 | result[path] = CipdDepsEntry(path, dep['packages']) |
Oleh Prypin | 6e9c00f | 2018-02-19 16:24:19 +0100 | [diff] [blame] | 227 | else: |
Oleh Prypin | 4775b27 | 2018-04-26 22:33:26 +0200 | [diff] [blame] | 228 | url, revision = dep['url'].split('@') |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 229 | result[path] = DepsEntry(path, url, revision) |
| 230 | |
| 231 | AddDepsEntries(deps_dict['deps']) |
| 232 | for deps_os in ['win', 'mac', 'unix', 'android', 'ios', 'unix']: |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 233 | AddDepsEntries(deps_dict.get('deps_os', {}).get(deps_os, {})) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 234 | return result |
| 235 | |
| 236 | |
Oleh Prypin | 4775b27 | 2018-04-26 22:33:26 +0200 | [diff] [blame] | 237 | def _FindChangedCipdPackages(path, old_pkgs, new_pkgs): |
| 238 | assert ({p['package'] for p in old_pkgs} == |
| 239 | {p['package'] for p in new_pkgs}) |
| 240 | for old_pkg in old_pkgs: |
| 241 | for new_pkg in new_pkgs: |
Oleh Prypin | a8eb1e6 | 2018-07-03 08:47:28 +0200 | [diff] [blame^] | 242 | old_version = old_pkg['version'] |
| 243 | new_version = new_pkg['version'] |
Oleh Prypin | 4775b27 | 2018-04-26 22:33:26 +0200 | [diff] [blame] | 244 | if (old_pkg['package'] == new_pkg['package'] and |
| 245 | old_version != new_version): |
| 246 | logging.debug('Roll dependency %s to %s', path, new_version) |
| 247 | yield ChangedCipdPackage(path, old_pkg['package'], |
| 248 | old_version, new_version) |
| 249 | |
| 250 | |
kjellander@webrtc.org | 177567c | 2016-12-22 10:40:28 +0100 | [diff] [blame] | 251 | def CalculateChangedDeps(webrtc_deps, new_cr_deps): |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 252 | """ |
kjellander@webrtc.org | 177567c | 2016-12-22 10:40:28 +0100 | [diff] [blame] | 253 | Calculate changed deps entries based on entries defined in the WebRTC DEPS |
| 254 | file: |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 255 | - If a shared dependency with the Chromium DEPS file: roll it to the same |
| 256 | revision as Chromium (i.e. entry in the new_cr_deps dict) |
| 257 | - If it's a Chromium sub-directory, roll it to the HEAD revision (notice |
| 258 | this means it may be ahead of the chromium_revision, but generally these |
| 259 | should be close). |
| 260 | - If it's another DEPS entry (not shared with Chromium), roll it to HEAD |
| 261 | unless it's configured to be skipped. |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 262 | |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 263 | Returns: |
| 264 | A list of ChangedDep objects representing the changed deps. |
| 265 | """ |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 266 | result = [] |
| 267 | webrtc_entries = BuildDepsentryDict(webrtc_deps) |
| 268 | new_cr_entries = BuildDepsentryDict(new_cr_deps) |
| 269 | for path, webrtc_deps_entry in webrtc_entries.iteritems(): |
| 270 | if path in DONT_AUTOROLL_THESE: |
| 271 | continue |
| 272 | cr_deps_entry = new_cr_entries.get(path) |
| 273 | if cr_deps_entry: |
Oleh Prypin | 4775b27 | 2018-04-26 22:33:26 +0200 | [diff] [blame] | 274 | assert type(cr_deps_entry) is type(webrtc_deps_entry) |
| 275 | |
| 276 | if isinstance(cr_deps_entry, CipdDepsEntry): |
| 277 | result.extend(_FindChangedCipdPackages(path, webrtc_deps_entry.packages, |
| 278 | cr_deps_entry.packages)) |
| 279 | continue |
| 280 | |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 281 | # Use the revision from Chromium's DEPS file. |
| 282 | new_rev = cr_deps_entry.revision |
| 283 | assert webrtc_deps_entry.url == cr_deps_entry.url, ( |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 284 | 'WebRTC DEPS entry %s has a different URL (%s) than Chromium (%s).' % |
| 285 | (path, webrtc_deps_entry.url, cr_deps_entry.url)) |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 286 | else: |
Oleh Prypin | a8eb1e6 | 2018-07-03 08:47:28 +0200 | [diff] [blame^] | 287 | if isinstance(webrtc_deps_entry, DepsEntry): |
| 288 | # Use the HEAD of the deps repo. |
| 289 | stdout, _ = _RunCommand(['git', 'ls-remote', webrtc_deps_entry.url, |
| 290 | 'HEAD']) |
| 291 | new_rev = stdout.strip().split('\t')[0] |
| 292 | else: |
| 293 | raise RollError('WebRTC DEPS entry %s is missing from Chromium. Remove ' |
| 294 | 'it or add it to DONT_AUTOROLL_THESE.' % path) |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 295 | |
| 296 | # Check if an update is necessary. |
| 297 | if webrtc_deps_entry.revision != new_rev: |
| 298 | logging.debug('Roll dependency %s to %s', path, new_rev) |
| 299 | result.append(ChangedDep(path, webrtc_deps_entry.url, |
| 300 | webrtc_deps_entry.revision, new_rev)) |
kjellander@webrtc.org | 177567c | 2016-12-22 10:40:28 +0100 | [diff] [blame] | 301 | return sorted(result) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 302 | |
| 303 | |
| 304 | def CalculateChangedClang(new_cr_rev): |
| 305 | def GetClangRev(lines): |
| 306 | for line in lines: |
| 307 | match = CLANG_REVISION_RE.match(line) |
| 308 | if match: |
| 309 | return match.group(1) |
kjellander | 3860c7f | 2016-01-19 02:04:41 -0800 | [diff] [blame] | 310 | raise RollError('Could not parse Clang revision!') |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 311 | |
kjellander@webrtc.org | 177567c | 2016-12-22 10:40:28 +0100 | [diff] [blame] | 312 | with open(CLANG_UPDATE_SCRIPT_LOCAL_PATH, 'rb') as f: |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 313 | current_lines = f.readlines() |
| 314 | current_rev = GetClangRev(current_lines) |
| 315 | |
kjellander | 3860c7f | 2016-01-19 02:04:41 -0800 | [diff] [blame] | 316 | new_clang_update_py = ReadRemoteCrFile(CLANG_UPDATE_SCRIPT_URL_PATH, |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 317 | new_cr_rev).splitlines() |
kjellander | 3860c7f | 2016-01-19 02:04:41 -0800 | [diff] [blame] | 318 | new_rev = GetClangRev(new_clang_update_py) |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 319 | return ChangedDep(CLANG_UPDATE_SCRIPT_LOCAL_PATH, None, current_rev, new_rev) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 320 | |
| 321 | |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 322 | def GenerateCommitMessage(rev_update, current_commit_pos, |
| 323 | new_commit_pos, changed_deps_list, clang_change): |
| 324 | current_cr_rev = rev_update.current_chromium_rev[0:10] |
| 325 | new_cr_rev = rev_update.new_chromium_rev[0:10] |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 326 | rev_interval = '%s..%s' % (current_cr_rev, new_cr_rev) |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 327 | git_number_interval = '%s:%s' % (current_commit_pos, new_commit_pos) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 328 | |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 329 | commit_msg = ['Roll chromium_revision %s (%s)\n' % (rev_interval, |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 330 | git_number_interval), |
| 331 | 'Change log: %s' % (CHROMIUM_LOG_TEMPLATE % rev_interval), |
| 332 | 'Full diff: %s\n' % (CHROMIUM_COMMIT_TEMPLATE % |
Artem Titov | 42f0d78 | 2018-06-27 13:23:17 +0200 | [diff] [blame] | 333 | rev_interval)] |
Henrik Kjellander | 6c2ba7d | 2015-10-02 09:03:06 +0200 | [diff] [blame] | 334 | tbr_authors = '' |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 335 | if changed_deps_list: |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 336 | commit_msg.append('Changed dependencies:') |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 337 | |
| 338 | for c in changed_deps_list: |
Oleh Prypin | 4775b27 | 2018-04-26 22:33:26 +0200 | [diff] [blame] | 339 | if isinstance(c, ChangedCipdPackage): |
| 340 | commit_msg.append('* %s: %s..%s' % (c.path, c.current_version, |
| 341 | c.new_version)) |
| 342 | else: |
| 343 | commit_msg.append('* %s: %s/+log/%s..%s' % (c.path, c.url, |
| 344 | c.current_rev[0:10], |
| 345 | c.new_rev[0:10])) |
Henrik Kjellander | 6c2ba7d | 2015-10-02 09:03:06 +0200 | [diff] [blame] | 346 | if 'libvpx' in c.path: |
stefan | a540ada | 2016-07-18 11:15:55 -0700 | [diff] [blame] | 347 | tbr_authors += 'marpan@webrtc.org, ' |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 348 | |
| 349 | change_url = CHROMIUM_FILE_TEMPLATE % (rev_interval, 'DEPS') |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 350 | commit_msg.append('DEPS diff: %s\n' % change_url) |
| 351 | else: |
| 352 | commit_msg.append('No dependencies changed.') |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 353 | |
| 354 | if clang_change.current_rev != clang_change.new_rev: |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 355 | commit_msg.append('Clang version changed %s:%s' % |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 356 | (clang_change.current_rev, clang_change.new_rev)) |
| 357 | change_url = CHROMIUM_FILE_TEMPLATE % (rev_interval, |
| 358 | CLANG_UPDATE_SCRIPT_URL_PATH) |
Henrik Kjellander | 417fec2 | 2015-10-02 13:39:52 +0200 | [diff] [blame] | 359 | commit_msg.append('Details: %s\n' % change_url) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 360 | else: |
Henrik Kjellander | 417fec2 | 2015-10-02 13:39:52 +0200 | [diff] [blame] | 361 | commit_msg.append('No update to Clang.\n') |
Henrik Kjellander | a9c584d | 2015-10-02 09:11:57 +0200 | [diff] [blame] | 362 | |
Edward Lemur | 033a1bf | 2017-09-14 14:50:54 +0200 | [diff] [blame] | 363 | # TBR needs to be non-empty for Gerrit to process it. |
Edward Lemur | 6ef2002 | 2017-09-14 20:46:01 +0200 | [diff] [blame] | 364 | git_author = _RunCommand(['git', 'config', 'user.email'], |
| 365 | working_dir=CHECKOUT_SRC_DIR)[0].splitlines()[0] |
| 366 | tbr_authors = git_author + ',' + tbr_authors |
| 367 | |
| 368 | commit_msg.append('TBR=%s' % tbr_authors) |
Henrik Kjellander | 0bb7f05 | 2016-09-21 23:11:23 +0200 | [diff] [blame] | 369 | commit_msg.append('BUG=None') |
ehmaldonado | 4d46a5e | 2017-08-10 15:32:02 -0700 | [diff] [blame] | 370 | commit_msg.append('CQ_INCLUDE_TRYBOTS=%s' % EXTRA_TRYBOTS) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 371 | return '\n'.join(commit_msg) |
| 372 | |
| 373 | |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 374 | def UpdateDepsFile(deps_filename, rev_update, changed_deps): |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 375 | """Update the DEPS file with the new revision.""" |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 376 | |
| 377 | # Update the chromium_revision variable. |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 378 | with open(deps_filename, 'rb') as deps_file: |
| 379 | deps_content = deps_file.read() |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 380 | deps_content = deps_content.replace(rev_update.current_chromium_rev, |
| 381 | rev_update.new_chromium_rev) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 382 | with open(deps_filename, 'wb') as deps_file: |
| 383 | deps_file.write(deps_content) |
| 384 | |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 385 | # Update each individual DEPS entry. |
| 386 | for dep in changed_deps: |
kjellander@webrtc.org | 177567c | 2016-12-22 10:40:28 +0100 | [diff] [blame] | 387 | local_dep_dir = os.path.join(CHECKOUT_ROOT_DIR, dep.path) |
| 388 | if not os.path.isdir(local_dep_dir): |
| 389 | raise RollError( |
| 390 | 'Cannot find local directory %s. Either run\n' |
| 391 | 'gclient sync --deps=all\n' |
| 392 | 'or make sure the .gclient file for your solution contains all ' |
| 393 | 'platforms in the target_os list, i.e.\n' |
| 394 | 'target_os = ["android", "unix", "mac", "ios", "win"];\n' |
| 395 | 'Then run "gclient sync" again.' % local_dep_dir) |
Oleh Prypin | 4775b27 | 2018-04-26 22:33:26 +0200 | [diff] [blame] | 396 | if isinstance(dep, ChangedCipdPackage): |
Oleh Prypin | a8eb1e6 | 2018-07-03 08:47:28 +0200 | [diff] [blame^] | 397 | package = dep.package.format() # Eliminate double curly brackets |
| 398 | update = '%s:%s@%s' % (dep.path, package, dep.new_version) |
Oleh Prypin | 4775b27 | 2018-04-26 22:33:26 +0200 | [diff] [blame] | 399 | else: |
| 400 | update = '%s@%s' % (dep.path, dep.new_rev) |
| 401 | _RunCommand(['gclient', 'setdep', '--revision', update], |
| 402 | working_dir=CHECKOUT_SRC_DIR) |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 403 | |
| 404 | |
Henrik Kjellander | 1b76ca1 | 2015-06-09 12:58:44 +0200 | [diff] [blame] | 405 | def _IsTreeClean(): |
| 406 | stdout, _ = _RunCommand(['git', 'status', '--porcelain']) |
| 407 | if len(stdout) == 0: |
| 408 | return True |
| 409 | |
| 410 | logging.error('Dirty/unversioned files:\n%s', stdout) |
| 411 | return False |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 412 | |
Henrik Kjellander | 44d5d7b | 2015-09-25 13:21:44 +0200 | [diff] [blame] | 413 | |
| 414 | def _EnsureUpdatedMasterBranch(dry_run): |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 415 | current_branch = _RunCommand( |
| 416 | ['git', 'rev-parse', '--abbrev-ref', 'HEAD'])[0].splitlines()[0] |
| 417 | if current_branch != 'master': |
| 418 | logging.error('Please checkout the master branch and re-run this script.') |
| 419 | if not dry_run: |
| 420 | sys.exit(-1) |
| 421 | |
Henrik Kjellander | 1b76ca1 | 2015-06-09 12:58:44 +0200 | [diff] [blame] | 422 | logging.info('Updating master branch...') |
Henrik Kjellander | 6c2ba7d | 2015-10-02 09:03:06 +0200 | [diff] [blame] | 423 | _RunCommand(['git', 'pull']) |
Henrik Kjellander | 44d5d7b | 2015-09-25 13:21:44 +0200 | [diff] [blame] | 424 | |
| 425 | |
| 426 | def _CreateRollBranch(dry_run): |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 427 | logging.info('Creating roll branch: %s', ROLL_BRANCH_NAME) |
| 428 | if not dry_run: |
| 429 | _RunCommand(['git', 'checkout', '-b', ROLL_BRANCH_NAME]) |
| 430 | |
| 431 | |
| 432 | def _RemovePreviousRollBranch(dry_run): |
| 433 | active_branch, branches = _GetBranches() |
| 434 | if active_branch == ROLL_BRANCH_NAME: |
| 435 | active_branch = 'master' |
| 436 | if ROLL_BRANCH_NAME in branches: |
| 437 | logging.info('Removing previous roll branch (%s)', ROLL_BRANCH_NAME) |
| 438 | if not dry_run: |
| 439 | _RunCommand(['git', 'checkout', active_branch]) |
| 440 | _RunCommand(['git', 'branch', '-D', ROLL_BRANCH_NAME]) |
| 441 | |
| 442 | |
| 443 | def _LocalCommit(commit_msg, dry_run): |
| 444 | logging.info('Committing changes locally.') |
| 445 | if not dry_run: |
| 446 | _RunCommand(['git', 'add', '--update', '.']) |
| 447 | _RunCommand(['git', 'commit', '-m', commit_msg]) |
| 448 | |
| 449 | |
Oleh Prypin | b76767b | 2018-01-02 13:13:23 +0100 | [diff] [blame] | 450 | def ChooseCQMode(skip_cq, cq_over, current_commit_pos, new_commit_pos): |
Oleh Prypin | 65fb17b | 2017-12-27 10:25:24 +0100 | [diff] [blame] | 451 | if skip_cq: |
| 452 | return 0 |
Oleh Prypin | 16b2a36 | 2017-12-27 21:03:55 +0100 | [diff] [blame] | 453 | if (new_commit_pos - current_commit_pos) < cq_over: |
Oleh Prypin | 65fb17b | 2017-12-27 10:25:24 +0100 | [diff] [blame] | 454 | return 1 |
| 455 | return 2 |
| 456 | |
| 457 | |
Oleh Prypin | b76767b | 2018-01-02 13:13:23 +0100 | [diff] [blame] | 458 | def _UploadCL(commit_queue_mode): |
Oleh Prypin | 65fb17b | 2017-12-27 10:25:24 +0100 | [diff] [blame] | 459 | """Upload the committed changes as a changelist to Gerrit. |
| 460 | |
Oleh Prypin | b76767b | 2018-01-02 13:13:23 +0100 | [diff] [blame] | 461 | commit_queue_mode: |
Oleh Prypin | 65fb17b | 2017-12-27 10:25:24 +0100 | [diff] [blame] | 462 | - 2: Submit to commit queue. |
Oleh Prypin | b76767b | 2018-01-02 13:13:23 +0100 | [diff] [blame] | 463 | - 1: Run trybots but do not submit to CQ. |
Oleh Prypin | 65fb17b | 2017-12-27 10:25:24 +0100 | [diff] [blame] | 464 | - 0: Skip CQ, upload only. |
| 465 | """ |
Oleh Prypin | b76767b | 2018-01-02 13:13:23 +0100 | [diff] [blame] | 466 | cmd = ['git', 'cl', 'upload', '-f', '--gerrit'] |
| 467 | if commit_queue_mode >= 2: |
| 468 | logging.info('Sending the CL to the CQ...') |
| 469 | cmd.extend(['--use-commit-queue', '--send-mail']) |
| 470 | elif commit_queue_mode >= 1: |
| 471 | logging.info('Starting CQ dry run...') |
| 472 | cmd.extend(['--cq-dry-run']) |
| 473 | _RunCommand(cmd, extra_env={'EDITOR': 'true', 'SKIP_GCE_AUTH_FOR_GIT': '1'}) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 474 | |
| 475 | |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 476 | def GetRollRevisionRanges(opts, webrtc_deps): |
| 477 | current_cr_rev = webrtc_deps['vars']['chromium_revision'] |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 478 | new_cr_rev = opts.revision |
| 479 | if not new_cr_rev: |
| 480 | stdout, _ = _RunCommand(['git', 'ls-remote', CHROMIUM_SRC_URL, 'HEAD']) |
| 481 | head_rev = stdout.strip().split('\t')[0] |
| 482 | logging.info('No revision specified. Using HEAD: %s', head_rev) |
| 483 | new_cr_rev = head_rev |
| 484 | |
Artem Titov | 42f0d78 | 2018-06-27 13:23:17 +0200 | [diff] [blame] | 485 | return ChromiumRevisionUpdate(current_cr_rev, new_cr_rev) |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 486 | |
| 487 | |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 488 | def main(): |
| 489 | p = argparse.ArgumentParser() |
| 490 | p.add_argument('--clean', action='store_true', default=False, |
| 491 | help='Removes any previous local roll branch.') |
| 492 | p.add_argument('-r', '--revision', |
| 493 | help=('Chromium Git revision to roll to. Defaults to the ' |
Henrik Kjellander | 18b042f | 2015-10-02 09:01:39 +0200 | [diff] [blame] | 494 | 'Chromium HEAD revision if omitted.')) |
Henrik Kjellander | 42b6c63 | 2015-10-05 10:44:24 +0200 | [diff] [blame] | 495 | p.add_argument('-u', '--rietveld-email', |
| 496 | help=('E-mail address to use for creating the CL at Rietveld' |
| 497 | 'If omitted a previously cached one will be used or an ' |
| 498 | 'error will be thrown during upload.')) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 499 | p.add_argument('--dry-run', action='store_true', default=False, |
| 500 | help=('Calculate changes and modify DEPS, but don\'t create ' |
| 501 | 'any local branch, commit, upload CL or send any ' |
| 502 | 'tryjobs.')) |
kjellander | 665da28 | 2016-12-14 03:57:08 -0800 | [diff] [blame] | 503 | p.add_argument('-i', '--ignore-unclean-workdir', action='store_true', |
| 504 | default=False, |
| 505 | help=('Ignore if the current branch is not master or if there ' |
| 506 | 'are uncommitted changes (default: %(default)s).')) |
Oleh Prypin | 65fb17b | 2017-12-27 10:25:24 +0100 | [diff] [blame] | 507 | grp = p.add_mutually_exclusive_group() |
| 508 | grp.add_argument('--skip-cq', action='store_true', default=False, |
| 509 | help='Skip sending the CL to the CQ (default: %(default)s)') |
| 510 | grp.add_argument('--cq-over', type=int, default=1, |
| 511 | help=('Commit queue dry run if the revision difference ' |
| 512 | 'is below this number (default: %(default)s)')) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 513 | p.add_argument('-v', '--verbose', action='store_true', default=False, |
| 514 | help='Be extra verbose in printing of log messages.') |
| 515 | opts = p.parse_args() |
| 516 | |
| 517 | if opts.verbose: |
| 518 | logging.basicConfig(level=logging.DEBUG) |
| 519 | else: |
| 520 | logging.basicConfig(level=logging.INFO) |
| 521 | |
kjellander | 665da28 | 2016-12-14 03:57:08 -0800 | [diff] [blame] | 522 | if not opts.ignore_unclean_workdir and not _IsTreeClean(): |
Henrik Kjellander | 1b76ca1 | 2015-06-09 12:58:44 +0200 | [diff] [blame] | 523 | logging.error('Please clean your local checkout first.') |
| 524 | return 1 |
| 525 | |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 526 | if opts.clean: |
| 527 | _RemovePreviousRollBranch(opts.dry_run) |
| 528 | |
kjellander | 665da28 | 2016-12-14 03:57:08 -0800 | [diff] [blame] | 529 | if not opts.ignore_unclean_workdir: |
| 530 | _EnsureUpdatedMasterBranch(opts.dry_run) |
Henrik Kjellander | 44d5d7b | 2015-09-25 13:21:44 +0200 | [diff] [blame] | 531 | |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 532 | deps_filename = os.path.join(CHECKOUT_SRC_DIR, 'DEPS') |
| 533 | webrtc_deps = ParseLocalDepsFile(deps_filename) |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 534 | rev_update = GetRollRevisionRanges(opts, webrtc_deps) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 535 | |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 536 | current_commit_pos = ParseCommitPosition( |
| 537 | ReadRemoteCrCommit(rev_update.current_chromium_rev)) |
| 538 | new_commit_pos = ParseCommitPosition( |
| 539 | ReadRemoteCrCommit(rev_update.new_chromium_rev)) |
| 540 | |
| 541 | new_cr_deps = ParseRemoteCrDepsFile(rev_update.new_chromium_rev) |
kjellander@webrtc.org | 177567c | 2016-12-22 10:40:28 +0100 | [diff] [blame] | 542 | changed_deps = CalculateChangedDeps(webrtc_deps, new_cr_deps) |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 543 | clang_change = CalculateChangedClang(rev_update.new_chromium_rev) |
| 544 | commit_msg = GenerateCommitMessage(rev_update, |
kjellander | 38b6dbc | 2016-12-13 03:35:21 -0800 | [diff] [blame] | 545 | current_commit_pos, new_commit_pos, |
| 546 | changed_deps, clang_change) |
| 547 | logging.debug('Commit message:\n%s', commit_msg) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 548 | |
| 549 | _CreateRollBranch(opts.dry_run) |
Artem Titov | a04d140 | 2018-05-11 11:23:00 +0200 | [diff] [blame] | 550 | UpdateDepsFile(deps_filename, rev_update, changed_deps) |
kjellander | c99bddf | 2017-05-15 02:40:58 -0700 | [diff] [blame] | 551 | if _IsTreeClean(): |
| 552 | logging.info("No DEPS changes detected, skipping CL creation.") |
| 553 | else: |
| 554 | _LocalCommit(commit_msg, opts.dry_run) |
Oleh Prypin | b76767b | 2018-01-02 13:13:23 +0100 | [diff] [blame] | 555 | commit_queue_mode = ChooseCQMode(opts.skip_cq, opts.cq_over, |
| 556 | current_commit_pos, new_commit_pos) |
| 557 | logging.info('Uploading CL...') |
| 558 | if not opts.dry_run: |
| 559 | _UploadCL(commit_queue_mode) |
Henrik Kjellander | 8d3ad82 | 2015-05-26 19:52:05 +0200 | [diff] [blame] | 560 | return 0 |
| 561 | |
| 562 | |
| 563 | if __name__ == '__main__': |
| 564 | sys.exit(main()) |