Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 1 | #!/usr/bin/env python3 |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 2 | # Copyright (c) 2019, the R8 project authors. Please see the AUTHORS file |
| 3 | # for details. All rights reserved. Use of this source code is governed by a |
| 4 | # BSD-style license that can be found in the LICENSE file. |
| 5 | |
| 6 | import argparse |
| 7 | import datetime |
| 8 | import os.path |
| 9 | import re |
Søren Gjesse | 4062e9c | 2023-09-01 12:21:08 +0200 | [diff] [blame] | 10 | import stat |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 11 | import subprocess |
| 12 | import sys |
Christoffer Quist Adamsen | d408d8d | 2021-01-26 19:50:39 +0100 | [diff] [blame] | 13 | import urllib.request |
Søren Gjesse | 2d6e937 | 2020-11-04 08:17:28 +0100 | [diff] [blame] | 14 | import xml.etree.ElementTree |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 15 | import zipfile |
Ian Zerny | cf1eb3c | 2020-09-24 08:27:23 +0200 | [diff] [blame] | 16 | |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 17 | import utils |
| 18 | |
Søren Gjesse | 448da11 | 2023-08-10 09:30:55 +0200 | [diff] [blame] | 19 | R8_DEV_BRANCH = '8.3' |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 20 | R8_VERSION_FILE = os.path.join( |
| 21 | 'src', 'main', 'java', 'com', 'android', 'tools', 'r8', 'Version.java') |
Søren Gjesse | 2725159 | 2019-11-06 17:35:23 +0100 | [diff] [blame] | 22 | THIS_FILE_RELATIVE = os.path.join('tools', 'r8_release.py') |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 23 | GMAVEN_PUBLISHER = '/google/bin/releases/android-devtools/gmaven/publisher/gmaven-publisher' |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 24 | |
| 25 | DESUGAR_JDK_LIBS = 'desugar_jdk_libs' |
| 26 | DESUGAR_JDK_LIBS_CONFIGURATION = DESUGAR_JDK_LIBS + '_configuration' |
| 27 | ANDROID_TOOLS_PACKAGE = 'com.android.tools' |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 28 | |
Søren Gjesse | 07b6aea | 2019-12-12 11:11:58 +0100 | [diff] [blame] | 29 | GITHUB_DESUGAR_JDK_LIBS = 'https://github.com/google/desugar_jdk_libs' |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 30 | |
Søren Gjesse | 4062e9c | 2023-09-01 12:21:08 +0200 | [diff] [blame] | 31 | def install_gerrit_change_id_hook(checkout_dir): |
| 32 | with utils.ChangedWorkingDirectory(checkout_dir): |
| 33 | # Fancy way of getting the string ".git". |
| 34 | git_dir = subprocess.check_output( |
| 35 | ['git', 'rev-parse', '--git-dir']).decode('utf-8').strip() |
| 36 | commit_msg_hooks = '%s/hooks/commit-msg' % git_dir |
| 37 | if not os.path.exists(os.path.dirname(commit_msg_hooks)): |
| 38 | os.mkdir(os.path.dirname(commit_msg_hooks)) |
| 39 | # Install commit hook to generate Gerrit 'Change-Id:'. |
| 40 | urllib.request.urlretrieve( |
| 41 | 'https://gerrit-review.googlesource.com/tools/hooks/commit-msg', |
| 42 | commit_msg_hooks) |
| 43 | st = os.stat(commit_msg_hooks) |
| 44 | os.chmod( |
| 45 | commit_msg_hooks, |
| 46 | st.st_mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH) |
| 47 | |
Morten Krogh-Jespersen | d86a301 | 2020-02-21 15:06:13 +0100 | [diff] [blame] | 48 | def checkout_r8(temp, branch): |
| 49 | subprocess.check_call(['git', 'clone', utils.REPO_SOURCE, temp]) |
| 50 | with utils.ChangedWorkingDirectory(temp): |
| 51 | subprocess.check_call([ |
| 52 | 'git', |
| 53 | 'new-branch', |
| 54 | '--upstream', |
| 55 | 'origin/%s' % branch, |
| 56 | 'dev-release']) |
Søren Gjesse | 4062e9c | 2023-09-01 12:21:08 +0200 | [diff] [blame] | 57 | install_gerrit_change_id_hook(temp) |
Morten Krogh-Jespersen | d86a301 | 2020-02-21 15:06:13 +0100 | [diff] [blame] | 58 | return temp |
| 59 | |
| 60 | |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 61 | def prepare_release(args): |
| 62 | if args.version: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 63 | print("Cannot manually specify version when making a dev release.") |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 64 | sys.exit(1) |
| 65 | |
| 66 | def make_release(args): |
| 67 | commithash = args.dev_release |
| 68 | |
| 69 | with utils.TempDir() as temp: |
Morten Krogh-Jespersen | d86a301 | 2020-02-21 15:06:13 +0100 | [diff] [blame] | 70 | with utils.ChangedWorkingDirectory(checkout_r8(temp, R8_DEV_BRANCH)): |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 71 | # Compute the current and new version on the branch. |
| 72 | result = None |
| 73 | for line in open(R8_VERSION_FILE, 'r'): |
| 74 | result = re.match( |
| 75 | r'.*LABEL = "%s\.(\d+)\-dev";' % R8_DEV_BRANCH, line) |
| 76 | if result: |
| 77 | break |
| 78 | if not result or not result.group(1): |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 79 | print('Failed to find version label matching %s(\d+)-dev'\ |
| 80 | % R8_DEV_BRANCH) |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 81 | sys.exit(1) |
| 82 | try: |
| 83 | patch_version = int(result.group(1)) |
| 84 | except ValueError: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 85 | print('Failed to convert version to integer: %s' % result.group(1)) |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 86 | |
| 87 | old_version = '%s.%s-dev' % (R8_DEV_BRANCH, patch_version) |
| 88 | version = '%s.%s-dev' % (R8_DEV_BRANCH, patch_version + 1) |
| 89 | |
Rico Wind | 1b52acf | 2021-03-21 12:36:55 +0100 | [diff] [blame] | 90 | # Verify that the merge point from main is not empty. |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 91 | merge_diff_output = subprocess.check_output([ |
Søren Gjesse | 4062e9c | 2023-09-01 12:21:08 +0200 | [diff] [blame] | 92 | 'git', 'diff', 'HEAD..%s' % commithash]).decode('utf-8') |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 93 | other_diff = version_change_diff( |
Rico Wind | 1b52acf | 2021-03-21 12:36:55 +0100 | [diff] [blame] | 94 | merge_diff_output, old_version, "main") |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 95 | if not other_diff: |
Rico Wind | 1b52acf | 2021-03-21 12:36:55 +0100 | [diff] [blame] | 96 | print('Merge point from main (%s)' % commithash, \ |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 97 | 'is the same as exiting release (%s).' % old_version) |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 98 | sys.exit(1) |
| 99 | |
Søren Gjesse | 4062e9c | 2023-09-01 12:21:08 +0200 | [diff] [blame] | 100 | subprocess.check_call([ |
| 101 | 'git', 'cl', 'new-branch', 'release-%s' % version]) |
| 102 | |
Rico Wind | 140a564 | 2019-11-26 10:44:21 +0100 | [diff] [blame] | 103 | if args.dev_pre_cherry_pick: |
| 104 | for pre_commit in args.dev_pre_cherry_pick: |
| 105 | subprocess.check_call([ |
| 106 | 'git', 'cherry-pick', '--no-edit', pre_commit]) |
| 107 | |
Rico Wind | 1b52acf | 2021-03-21 12:36:55 +0100 | [diff] [blame] | 108 | # Merge the desired commit from main on to the branch. |
Søren Gjesse | 4062e9c | 2023-09-01 12:21:08 +0200 | [diff] [blame] | 109 | subprocess.check_call(['git', 'merge', '--no-ff', '--no-edit', commithash]) |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 110 | |
| 111 | # Rewrite the version, commit and validate. |
| 112 | sed(old_version, version, R8_VERSION_FILE) |
| 113 | |
| 114 | subprocess.check_call([ |
Ian Zerny | 3224c81 | 2019-11-01 08:12:04 +0100 | [diff] [blame] | 115 | 'git', 'commit', '-a', '-m', 'Version %s' % version]) |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 116 | |
| 117 | version_diff_output = subprocess.check_output([ |
Christoffer Quist Adamsen | d408d8d | 2021-01-26 19:50:39 +0100 | [diff] [blame] | 118 | 'git', 'diff', '%s..HEAD' % commithash]).decode('utf-8') |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 119 | |
Rico Wind | 1b52acf | 2021-03-21 12:36:55 +0100 | [diff] [blame] | 120 | validate_version_change_diff(version_diff_output, "main", version) |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 121 | |
Søren Gjesse | 4062e9c | 2023-09-01 12:21:08 +0200 | [diff] [blame] | 122 | maybe_check_call(args, ['git', 'cl', 'upload', '--no-squash']) |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 123 | |
Søren Gjesse | 4062e9c | 2023-09-01 12:21:08 +0200 | [diff] [blame] | 124 | if args.dry_run: |
| 125 | input( |
| 126 | 'DryRun: check %s for content of version %s [enter to continue]:' |
| 127 | % (temp, version)) |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 128 | |
Søren Gjesse | 4062e9c | 2023-09-01 12:21:08 +0200 | [diff] [blame] | 129 | return "%s dev version %s from hash %s for review" % ( |
| 130 | 'DryRun: omitted upload of' if args.dry_run else 'Uploaded', |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 131 | version, |
| 132 | commithash) |
| 133 | |
| 134 | return make_release |
| 135 | |
| 136 | |
Søren Gjesse | 4e5c6fe | 2019-11-05 17:17:43 +0100 | [diff] [blame] | 137 | def maybe_tag(args, version): |
| 138 | maybe_check_call(args, [ |
| 139 | 'git', 'tag', '-a', version, '-m', '"%s"' % version]) |
| 140 | maybe_check_call(args, [ |
| 141 | 'git', 'push', 'origin', 'refs/tags/%s' % version]) |
| 142 | |
Morten Krogh-Jespersen | d86a301 | 2020-02-21 15:06:13 +0100 | [diff] [blame] | 143 | |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 144 | def version_change_diff(diff, old_version, new_version): |
| 145 | invalid_line = None |
Søren Gjesse | 25ef552 | 2021-05-05 08:17:00 +0200 | [diff] [blame] | 146 | for line in str(diff).splitlines(): |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 147 | if line.startswith('- ') and \ |
| 148 | line != '- public static final String LABEL = "%s";' % old_version: |
| 149 | invalid_line = line |
| 150 | elif line.startswith('+ ') and \ |
| 151 | line != '+ public static final String LABEL = "%s";' % new_version: |
| 152 | invalid_line = line |
| 153 | return invalid_line |
| 154 | |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 155 | |
Søren Gjesse | 4e5c6fe | 2019-11-05 17:17:43 +0100 | [diff] [blame] | 156 | def validate_version_change_diff(version_diff_output, old_version, new_version): |
| 157 | invalid = version_change_diff(version_diff_output, old_version, new_version) |
| 158 | if invalid: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 159 | print("Unexpected diff:") |
| 160 | print("=" * 80) |
| 161 | print(version_diff_output) |
| 162 | print("=" * 80) |
Søren Gjesse | 4e5c6fe | 2019-11-05 17:17:43 +0100 | [diff] [blame] | 163 | accept_string = 'THE DIFF IS OK!' |
Christoffer Quist Adamsen | d408d8d | 2021-01-26 19:50:39 +0100 | [diff] [blame] | 164 | answer = input( |
Søren Gjesse | 4e5c6fe | 2019-11-05 17:17:43 +0100 | [diff] [blame] | 165 | "Accept the additonal diff as part of the release? " |
| 166 | "Type '%s' to accept: " % accept_string) |
Christoffer Quist Adamsen | d408d8d | 2021-01-26 19:50:39 +0100 | [diff] [blame] | 167 | if answer != accept_string: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 168 | print("You did not type '%s'" % accept_string) |
| 169 | print('Aborting dev release for %s' % version) |
Søren Gjesse | 4e5c6fe | 2019-11-05 17:17:43 +0100 | [diff] [blame] | 170 | sys.exit(1) |
| 171 | |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 172 | |
| 173 | def maybe_check_call(args, cmd): |
| 174 | if args.dry_run: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 175 | print('DryRun:', ' '.join(cmd)) |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 176 | else: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 177 | print(' '.join(cmd)) |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 178 | return subprocess.check_call(cmd) |
| 179 | |
| 180 | |
Ian Zerny | 8c5f7b4 | 2023-05-25 11:24:05 +0200 | [diff] [blame] | 181 | def update_prebuilds(r8_checkout, version, checkout, keepanno=False): |
Morten Krogh-Jespersen | d86a301 | 2020-02-21 15:06:13 +0100 | [diff] [blame] | 182 | path = os.path.join(r8_checkout, 'tools', 'update_prebuilds_in_android.py') |
Ian Zerny | daf04ba | 2021-02-24 10:48:15 +0100 | [diff] [blame] | 183 | commit_arg = '--commit_hash=' if len(version) == 40 else '--version=' |
Ian Zerny | 8c5f7b4 | 2023-05-25 11:24:05 +0200 | [diff] [blame] | 184 | cmd = [path, '--targets=lib', '--maps', commit_arg + version, checkout] |
| 185 | if keepanno: |
| 186 | cmd.append("--keepanno") |
| 187 | subprocess.check_call(cmd) |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 188 | |
| 189 | |
Ian Zerny | 8c5f7b4 | 2023-05-25 11:24:05 +0200 | [diff] [blame] | 190 | def release_studio_or_aosp(r8_checkout, path, options, git_message, keepanno=False): |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 191 | with utils.ChangedWorkingDirectory(path): |
Søren Gjesse | 5f90ec4 | 2019-12-02 16:03:51 +0100 | [diff] [blame] | 192 | if not options.use_existing_work_branch: |
| 193 | subprocess.call(['repo', 'abandon', 'update-r8']) |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 194 | if not options.no_sync: |
Ian Zerny | 25cccae | 2019-10-21 11:07:24 +0200 | [diff] [blame] | 195 | subprocess.check_call(['repo', 'sync', '-cq', '-j', '16']) |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 196 | |
| 197 | prebuilts_r8 = os.path.join(path, 'prebuilts', 'r8') |
| 198 | |
Søren Gjesse | 5f90ec4 | 2019-12-02 16:03:51 +0100 | [diff] [blame] | 199 | if not options.use_existing_work_branch: |
| 200 | with utils.ChangedWorkingDirectory(prebuilts_r8): |
| 201 | subprocess.check_call(['repo', 'start', 'update-r8']) |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 202 | |
Ian Zerny | 8c5f7b4 | 2023-05-25 11:24:05 +0200 | [diff] [blame] | 203 | update_prebuilds(r8_checkout, options.version, path, keepanno) |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 204 | |
| 205 | with utils.ChangedWorkingDirectory(prebuilts_r8): |
Søren Gjesse | 5f90ec4 | 2019-12-02 16:03:51 +0100 | [diff] [blame] | 206 | if not options.use_existing_work_branch: |
| 207 | subprocess.check_call(['git', 'commit', '-a', '-m', git_message]) |
| 208 | else: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 209 | print('Not committing when --use-existing-work-branch. ' |
Søren Gjesse | 5f90ec4 | 2019-12-02 16:03:51 +0100 | [diff] [blame] | 210 | + 'Commit message should be:\n\n' |
| 211 | + git_message |
| 212 | + '\n') |
| 213 | # Don't upload if requested not to, or if changes are not committed due |
| 214 | # to --use-existing-work-branch |
| 215 | if not options.no_upload and not options.use_existing_work_branch: |
Rico Wind | c04d308 | 2023-05-25 09:59:18 +0200 | [diff] [blame] | 216 | process = subprocess.Popen(['repo', 'upload', '.', '--verify', |
| 217 | '--current-branch'], |
Søren Gjesse | 5f90ec4 | 2019-12-02 16:03:51 +0100 | [diff] [blame] | 218 | stdin=subprocess.PIPE) |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 219 | return process.communicate(input=b'y\n')[0] |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 220 | |
| 221 | |
Morten Krogh-Jespersen | b4a7acc | 2019-10-02 10:46:32 +0200 | [diff] [blame] | 222 | def prepare_aosp(args): |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 223 | assert args.version |
Morten Krogh-Jespersen | 00db27f | 2019-10-02 16:14:46 +0200 | [diff] [blame] | 224 | assert os.path.exists(args.aosp), "Could not find AOSP path %s" % args.aosp |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 225 | |
| 226 | def release_aosp(options): |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 227 | print("Releasing for AOSP") |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 228 | if options.dry_run: |
| 229 | return 'DryRun: omitting AOSP release for %s' % options.version |
| 230 | |
Morten Krogh-Jespersen | b4a7acc | 2019-10-02 10:46:32 +0200 | [diff] [blame] | 231 | git_message = ("""Update D8 and R8 to %s |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 232 | |
Morten Krogh-Jespersen | dbbf9a8 | 2020-08-11 21:38:08 +0200 | [diff] [blame] | 233 | Version: %s |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 234 | This build IS NOT suitable for preview or public release. |
| 235 | |
Morten Krogh-Jespersen | b4a7acc | 2019-10-02 10:46:32 +0200 | [diff] [blame] | 236 | Built here: go/r8-releases/raw/%s |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 237 | |
| 238 | Test: TARGET_PRODUCT=aosp_arm64 m -j core-oj""" |
Morten Krogh-Jespersen | b4a7acc | 2019-10-02 10:46:32 +0200 | [diff] [blame] | 239 | % (args.version, args.version, args.version)) |
Søren Gjesse | c15a7f7 | 2023-06-09 12:29:16 +0200 | [diff] [blame] | 240 | # Fixes to Android U branch is based of 8.2.2-dev where the keepanno library |
| 241 | # is not built. |
| 242 | keepanno = not args.version.startswith('8.2.2-udc') |
Morten Krogh-Jespersen | d86a301 | 2020-02-21 15:06:13 +0100 | [diff] [blame] | 243 | return release_studio_or_aosp( |
Søren Gjesse | c15a7f7 | 2023-06-09 12:29:16 +0200 | [diff] [blame] | 244 | utils.REPO_ROOT, args.aosp, options, git_message, keepanno=keepanno) |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 245 | |
| 246 | return release_aosp |
| 247 | |
| 248 | |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 249 | def prepare_maven(args): |
| 250 | assert args.version |
| 251 | |
| 252 | def release_maven(options): |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 253 | gfile = '/bigstore/r8-releases/raw/%s/r8lib.zip' % args.version |
| 254 | release_id = gmaven_publisher_stage(options, [gfile]) |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 255 | |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 256 | print("Staged Release ID " + release_id + ".\n") |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 257 | gmaven_publisher_stage_redir_test_info( |
| 258 | release_id, "com.android.tools:r8:%s" % args.version, "r8lib.jar") |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 259 | |
| 260 | print |
Christoffer Quist Adamsen | d408d8d | 2021-01-26 19:50:39 +0100 | [diff] [blame] | 261 | answer = input("Continue with publishing [y/N]:") |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 262 | |
Christoffer Quist Adamsen | d408d8d | 2021-01-26 19:50:39 +0100 | [diff] [blame] | 263 | if answer != 'y': |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 264 | print('Aborting release to Google maven') |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 265 | sys.exit(1) |
| 266 | |
| 267 | gmaven_publisher_publish(args, release_id) |
| 268 | |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 269 | print("") |
| 270 | print("Published. Use the email workflow for approval.") |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 271 | |
| 272 | return release_maven |
| 273 | |
Ian Zerny | acfaf29 | 2020-09-24 07:14:56 +0200 | [diff] [blame] | 274 | # ------------------------------------------------------ column 70 --v |
Ian Zerny | cf1eb3c | 2020-09-24 08:27:23 +0200 | [diff] [blame] | 275 | def git_message_dev(version, bugs): |
Morten Krogh-Jespersen | dbbf9a8 | 2020-08-11 21:38:08 +0200 | [diff] [blame] | 276 | return """Update D8 R8 to %s |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 277 | |
Ian Zerny | acfaf29 | 2020-09-24 07:14:56 +0200 | [diff] [blame] | 278 | This is a development snapshot, it's fine to use for studio canary |
| 279 | build, but not for BETA or release, for those we would need a release |
| 280 | version of R8 binaries. This build IS suitable for preview release |
| 281 | but IS NOT suitable for public release. |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 282 | |
Morten Krogh-Jespersen | b4a7acc | 2019-10-02 10:46:32 +0200 | [diff] [blame] | 283 | Built here: go/r8-releases/raw/%s |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 284 | Test: ./gradlew check |
Ian Zerny | fec0009 | 2022-03-16 08:25:07 +0100 | [diff] [blame] | 285 | Bug: %s""" % (version, version, '\nBug: '.join(map(bug_fmt, bugs))) |
Morten Krogh-Jespersen | b4a7acc | 2019-10-02 10:46:32 +0200 | [diff] [blame] | 286 | |
| 287 | |
Morten Krogh-Jespersen | a1396cd | 2019-10-02 16:14:40 +0200 | [diff] [blame] | 288 | def git_message_release(version, bugs): |
| 289 | return """D8 R8 version %s |
| 290 | |
| 291 | Built here: go/r8-releases/raw/%s/ |
| 292 | Test: ./gradlew check |
Morten Krogh-Jespersen | d86a301 | 2020-02-21 15:06:13 +0100 | [diff] [blame] | 293 | |
Ian Zerny | fec0009 | 2022-03-16 08:25:07 +0100 | [diff] [blame] | 294 | Bug: %s""" % (version, version, '\nBug: '.join(map(bug_fmt, bugs))) |
Morten Krogh-Jespersen | a1396cd | 2019-10-02 16:14:40 +0200 | [diff] [blame] | 295 | |
Ian Zerny | fec0009 | 2022-03-16 08:25:07 +0100 | [diff] [blame] | 296 | def bug_fmt(bug): |
| 297 | return "b/%s" % bug |
Morten Krogh-Jespersen | a1396cd | 2019-10-02 16:14:40 +0200 | [diff] [blame] | 298 | |
Morten Krogh-Jespersen | b4a7acc | 2019-10-02 10:46:32 +0200 | [diff] [blame] | 299 | def prepare_studio(args): |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 300 | assert args.version |
Morten Krogh-Jespersen | 00db27f | 2019-10-02 16:14:46 +0200 | [diff] [blame] | 301 | assert os.path.exists(args.studio), ("Could not find STUDIO path %s" |
| 302 | % args.studio) |
Morten Krogh-Jespersen | b4a7acc | 2019-10-02 10:46:32 +0200 | [diff] [blame] | 303 | |
| 304 | def release_studio(options): |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 305 | print("Releasing for STUDIO") |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 306 | if options.dry_run: |
| 307 | return 'DryRun: omitting studio release for %s' % options.version |
| 308 | |
Morten Krogh-Jespersen | d86a301 | 2020-02-21 15:06:13 +0100 | [diff] [blame] | 309 | if 'dev' in options.version: |
Ian Zerny | cf1eb3c | 2020-09-24 08:27:23 +0200 | [diff] [blame] | 310 | git_message = git_message_dev(options.version, options.bug) |
Morten Krogh-Jespersen | d86a301 | 2020-02-21 15:06:13 +0100 | [diff] [blame] | 311 | r8_checkout = utils.REPO_ROOT |
| 312 | return release_studio_or_aosp( |
| 313 | r8_checkout, args.studio, options, git_message) |
| 314 | else: |
| 315 | with utils.TempDir() as temp: |
| 316 | checkout_r8(temp, options.version[0:options.version.rindex('.')]) |
| 317 | git_message = git_message_release(options.version, options.bug) |
| 318 | return release_studio_or_aosp(temp, args.studio, options, git_message) |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 319 | |
| 320 | return release_studio |
| 321 | |
| 322 | |
| 323 | def g4_cp(old, new, file): |
| 324 | subprocess.check_call('g4 cp {%s,%s}/%s' % (old, new, file), shell=True) |
| 325 | |
| 326 | |
| 327 | def g4_open(file): |
Søren Gjesse | 0896766 | 2020-05-06 19:46:32 +0200 | [diff] [blame] | 328 | if not os.access(file, os.W_OK): |
| 329 | subprocess.check_call('g4 open %s' % file, shell=True) |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 330 | |
| 331 | |
Rico Wind | 8d008ca | 2020-04-22 12:13:15 +0200 | [diff] [blame] | 332 | def g4_change(version): |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 333 | return subprocess.check_output( |
Rico Wind | 8d008ca | 2020-04-22 12:13:15 +0200 | [diff] [blame] | 334 | 'g4 change --desc "Update R8 to version %s\n"' % (version), |
Christoffer Quist Adamsen | d408d8d | 2021-01-26 19:50:39 +0100 | [diff] [blame] | 335 | shell=True).decode('utf-8') |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 336 | |
Morten Krogh-Jespersen | 1f2f514 | 2020-09-21 11:20:23 +0200 | [diff] [blame] | 337 | def get_cl_id(c4_change_output): |
| 338 | startIndex = c4_change_output.find('Change ') + len('Change ') |
| 339 | endIndex = c4_change_output.find(' ', startIndex) |
| 340 | cl = c4_change_output[startIndex:endIndex] |
| 341 | assert cl.isdigit() |
| 342 | return cl |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 343 | |
| 344 | def sed(pattern, replace, path): |
| 345 | with open(path, "r") as sources: |
| 346 | lines = sources.readlines() |
| 347 | with open(path, "w") as sources: |
| 348 | for line in lines: |
| 349 | sources.write(re.sub(pattern, replace, line)) |
| 350 | |
| 351 | |
Morten Krogh-Jespersen | b4a7acc | 2019-10-02 10:46:32 +0200 | [diff] [blame] | 352 | def download_file(version, file, dst): |
Ian Zerny | 86c4cfd | 2022-01-17 13:43:37 +0100 | [diff] [blame] | 353 | dir = 'raw' if len(version) != 40 else 'raw/main' |
Christoffer Quist Adamsen | d408d8d | 2021-01-26 19:50:39 +0100 | [diff] [blame] | 354 | urllib.request.urlretrieve( |
Ian Zerny | 86c4cfd | 2022-01-17 13:43:37 +0100 | [diff] [blame] | 355 | ('https://storage.googleapis.com/r8-releases/%s/%s/%s' % (dir, version, file)), |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 356 | dst) |
| 357 | |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 358 | def download_gfile(gfile, dst): |
| 359 | if not gfile.startswith('/bigstore/r8-releases'): |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 360 | print('Unexpected gfile prefix for %s' % gfile) |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 361 | sys.exit(1) |
| 362 | |
Christoffer Quist Adamsen | d408d8d | 2021-01-26 19:50:39 +0100 | [diff] [blame] | 363 | urllib.request.urlretrieve( |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 364 | 'https://storage.googleapis.com/%s' % gfile[len('/bigstore/'):], |
| 365 | dst) |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 366 | |
| 367 | def blaze_run(target): |
| 368 | return subprocess.check_output( |
Christoffer Quist Adamsen | d408d8d | 2021-01-26 19:50:39 +0100 | [diff] [blame] | 369 | 'blaze run %s' % target, shell=True, stderr=subprocess.STDOUT).decode('utf-8') |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 370 | |
| 371 | |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 372 | def prepare_google3(args): |
| 373 | assert args.version |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 374 | # Check if an existing client exists. |
Søren Gjesse | 7e0ef85 | 2019-12-04 13:52:33 +0100 | [diff] [blame] | 375 | if not args.use_existing_work_branch: |
Søren Gjesse | 0896766 | 2020-05-06 19:46:32 +0200 | [diff] [blame] | 376 | check_no_google3_client(args, args.p4_client) |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 377 | |
| 378 | def release_google3(options): |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 379 | print("Releasing for Google 3") |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 380 | if options.dry_run: |
| 381 | return 'DryRun: omitting g3 release for %s' % options.version |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 382 | |
| 383 | google3_base = subprocess.check_output( |
Christoffer Quist Adamsen | d408d8d | 2021-01-26 19:50:39 +0100 | [diff] [blame] | 384 | ['p4', 'g4d', '-f', args.p4_client]).decode('utf-8').rstrip() |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 385 | third_party_r8 = os.path.join(google3_base, 'third_party', 'java', 'r8') |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 386 | today = datetime.date.today() |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 387 | with utils.ChangedWorkingDirectory(third_party_r8): |
Rico Wind | 8d008ca | 2020-04-22 12:13:15 +0200 | [diff] [blame] | 388 | # download files |
| 389 | g4_open('full.jar') |
| 390 | g4_open('src.jar') |
| 391 | g4_open('lib.jar') |
| 392 | g4_open('lib.jar.map') |
Morten Krogh-Jespersen | 0452794 | 2022-08-02 13:50:11 +0200 | [diff] [blame] | 393 | g4_open('retrace_full.jar') |
Morten Krogh-Jespersen | 98ee89a | 2021-10-25 20:59:02 +0200 | [diff] [blame] | 394 | g4_open('retrace_lib.jar') |
Morten Krogh-Jespersen | 0452794 | 2022-08-02 13:50:11 +0200 | [diff] [blame] | 395 | g4_open('retrace_lib.jar.map') |
Rico Wind | 369a21c | 2020-08-25 14:47:05 +0200 | [diff] [blame] | 396 | g4_open('desugar_jdk_libs_configuration.jar') |
Rico Wind | 8d008ca | 2020-04-22 12:13:15 +0200 | [diff] [blame] | 397 | download_file(options.version, 'r8-full-exclude-deps.jar', 'full.jar') |
Morten Krogh-Jespersen | 0452794 | 2022-08-02 13:50:11 +0200 | [diff] [blame] | 398 | download_file(options.version, 'r8-full-exclude-deps.jar', 'retrace_full.jar') |
Rico Wind | 8d008ca | 2020-04-22 12:13:15 +0200 | [diff] [blame] | 399 | download_file(options.version, 'r8-src.jar', 'src.jar') |
| 400 | download_file(options.version, 'r8lib-exclude-deps.jar', 'lib.jar') |
| 401 | download_file( |
| 402 | options.version, 'r8lib-exclude-deps.jar.map', 'lib.jar.map') |
Morten Krogh-Jespersen | 0452794 | 2022-08-02 13:50:11 +0200 | [diff] [blame] | 403 | download_file( |
| 404 | options.version, 'r8lib-exclude-deps.jar.map', 'retrace_lib.jar.map') |
Rico Wind | 369a21c | 2020-08-25 14:47:05 +0200 | [diff] [blame] | 405 | download_file(options.version, 'desugar_jdk_libs_configuration.jar', |
| 406 | 'desugar_jdk_libs_configuration.jar') |
Morten Krogh-Jespersen | 98ee89a | 2021-10-25 20:59:02 +0200 | [diff] [blame] | 407 | download_file(options.version, 'r8retrace-exclude-deps.jar', 'retrace_lib.jar') |
Rico Wind | 8d008ca | 2020-04-22 12:13:15 +0200 | [diff] [blame] | 408 | g4_open('METADATA') |
Søren Gjesse | e4f90c6 | 2022-06-27 12:47:45 +0200 | [diff] [blame] | 409 | metadata_path = os.path.join(third_party_r8, 'METADATA') |
| 410 | match_count = 0 |
| 411 | version_match_regexp = r'[1-9]\.[0-9]{1,2}\.[0-9]{1,3}-dev' |
| 412 | for line in open(metadata_path, 'r'): |
| 413 | result = re.search(version_match_regexp, line) |
| 414 | if result: |
| 415 | match_count = match_count + 1 |
Christoffer Quist Adamsen | de10425 | 2023-08-24 13:22:27 +0200 | [diff] [blame] | 416 | if match_count != 7: |
| 417 | print(( |
| 418 | "Could not find the previous -dev release string to replace in " |
| 419 | + "METADATA. Expected to find is mentioned 7 times, but " |
| 420 | + "found %s occurrences. Please update %s manually and run " |
| 421 | + "again with options --google3 " |
| 422 | + "--use-existing-work-branch.") |
| 423 | % (match_count, metadata_path)) |
Søren Gjesse | e4f90c6 | 2022-06-27 12:47:45 +0200 | [diff] [blame] | 424 | sys.exit(1) |
| 425 | sed(version_match_regexp, options.version, metadata_path) |
Rico Wind | 8d008ca | 2020-04-22 12:13:15 +0200 | [diff] [blame] | 426 | sed(r'\{ year.*\}', |
| 427 | ('{ year: %i month: %i day: %i }' |
| 428 | % (today.year, today.month, today.day)), |
Søren Gjesse | e4f90c6 | 2022-06-27 12:47:45 +0200 | [diff] [blame] | 429 | metadata_path) |
Rico Wind | 8d008ca | 2020-04-22 12:13:15 +0200 | [diff] [blame] | 430 | subprocess.check_output('chmod u+w *', shell=True) |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 431 | |
| 432 | with utils.ChangedWorkingDirectory(google3_base): |
| 433 | blaze_result = blaze_run('//third_party/java/r8:d8 -- --version') |
| 434 | |
| 435 | assert options.version in blaze_result |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 436 | |
Søren Gjesse | 5f90ec4 | 2019-12-02 16:03:51 +0100 | [diff] [blame] | 437 | if not options.no_upload: |
Morten Krogh-Jespersen | 1f2f514 | 2020-09-21 11:20:23 +0200 | [diff] [blame] | 438 | change_result = g4_change(options.version) |
| 439 | change_result += 'Run \'(g4d ' + args.p4_client \ |
| 440 | + ' && tap_presubmit -p all --train -c ' \ |
Søren Gjesse | 8a5f3df | 2021-06-09 14:48:40 +0200 | [diff] [blame] | 441 | + get_cl_id(change_result) + ')\' for running TAP global' \ |
| 442 | + ' presubmit using the train.\n' \ |
| 443 | + 'Run \'(g4d ' + args.p4_client \ |
| 444 | + ' && tap_presubmit -p all --notrain --detach --email' \ |
| 445 | + ' --skip_flaky_targets --skip_already_failing -c ' \ |
| 446 | + get_cl_id(change_result) + ')\' for running an isolated' \ |
| 447 | + ' TAP global presubmit.' |
Morten Krogh-Jespersen | 1f2f514 | 2020-09-21 11:20:23 +0200 | [diff] [blame] | 448 | return change_result |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 449 | |
| 450 | return release_google3 |
| 451 | |
| 452 | |
Morten Krogh-Jespersen | 0452794 | 2022-08-02 13:50:11 +0200 | [diff] [blame] | 453 | def prepare_google3_retrace(args): |
| 454 | assert args.version |
| 455 | # Check if an existing client exists. |
| 456 | if not args.use_existing_work_branch: |
| 457 | check_no_google3_client(args, args.p4_client) |
| 458 | |
| 459 | def release_google3_retrace(options): |
| 460 | print("Releasing Retrace for Google 3") |
| 461 | if options.dry_run: |
| 462 | return 'DryRun: omitting g3 release for %s' % options.version |
| 463 | |
| 464 | google3_base = subprocess.check_output( |
| 465 | ['p4', 'g4d', '-f', args.p4_client]).decode('utf-8').rstrip() |
| 466 | third_party_r8 = os.path.join(google3_base, 'third_party', 'java', 'r8') |
| 467 | with utils.ChangedWorkingDirectory(third_party_r8): |
| 468 | # download files |
| 469 | g4_open('retrace_full.jar') |
| 470 | g4_open('retrace_lib.jar') |
| 471 | g4_open('retrace_lib.jar.map') |
| 472 | download_file(options.version, 'r8-full-exclude-deps.jar', 'retrace_full.jar') |
| 473 | download_file(options.version, 'r8retrace-exclude-deps.jar', 'retrace_lib.jar') |
| 474 | download_file( |
| 475 | options.version, 'r8lib-exclude-deps.jar.map', 'retrace_lib.jar.map') |
| 476 | g4_open('METADATA') |
| 477 | metadata_path = os.path.join(third_party_r8, 'METADATA') |
| 478 | match_count = 0 |
| 479 | version_match_regexp = r'[1-9]\.[0-9]{1,2}\.[0-9]{1,3}-dev/r8retrace-exclude-deps.jar' |
| 480 | for line in open(metadata_path, 'r'): |
| 481 | result = re.search(version_match_regexp, line) |
| 482 | if result: |
| 483 | match_count = match_count + 1 |
| 484 | if match_count != 1: |
| 485 | print(("Could not find the previous retrace release string to replace in " + |
| 486 | "METADATA. Expected to find is mentioned 1 times. Please update %s " + |
| 487 | "manually and run again with options --google3retrace " + |
| 488 | "--use-existing-work-branch.") % metadata_path) |
| 489 | sys.exit(1) |
| 490 | sed(version_match_regexp, options.version + "/r8retrace-exclude-deps.jar", metadata_path) |
| 491 | subprocess.check_output('chmod u+w *', shell=True) |
| 492 | |
| 493 | with utils.ChangedWorkingDirectory(google3_base): |
| 494 | blaze_result = blaze_run('//third_party/java/r8:retrace -- --version') |
| 495 | |
| 496 | print(blaze_result) |
| 497 | assert options.version in blaze_result |
| 498 | |
| 499 | if not options.no_upload: |
| 500 | change_result = g4_change(options.version) |
| 501 | change_result += 'Run \'(g4d ' + args.p4_client \ |
| 502 | + ' && tap_presubmit -p all --train -c ' \ |
| 503 | + get_cl_id(change_result) + ')\' for running TAP global' \ |
| 504 | + ' presubmit using the train.\n' \ |
| 505 | + 'Run \'(g4d ' + args.p4_client \ |
| 506 | + ' && tap_presubmit -p all --notrain --detach --email' \ |
| 507 | + ' --skip_flaky_targets --skip_already_failing -c ' \ |
| 508 | + get_cl_id(change_result) + ')\' for running an isolated' \ |
| 509 | + ' TAP global presubmit.' |
| 510 | return change_result |
| 511 | |
| 512 | return release_google3_retrace |
| 513 | |
Søren Gjesse | 73355ec | 2020-06-29 09:19:44 +0200 | [diff] [blame] | 514 | def update_desugar_library_in_studio(args): |
| 515 | assert os.path.exists(args.studio), ("Could not find STUDIO path %s" |
| 516 | % args.studio) |
| 517 | |
| 518 | def make_release(args): |
| 519 | library_version = args.update_desugar_library_in_studio[0] |
| 520 | configuration_version = args.update_desugar_library_in_studio[1] |
| 521 | change_name = 'update-desugar-library-dependencies' |
| 522 | |
| 523 | with utils.ChangedWorkingDirectory(args.studio): |
| 524 | if not args.use_existing_work_branch: |
| 525 | subprocess.call(['repo', 'abandon', change_name]) |
| 526 | if not args.no_sync: |
| 527 | subprocess.check_call(['repo', 'sync', '-cq', '-j', '16']) |
| 528 | |
| 529 | cmd = ['tools/base/bazel/bazel', |
| 530 | 'run', |
| 531 | '//tools/base/bazel:add_dependency', |
| 532 | '--', |
| 533 | '--repo=https://maven.google.com com.android.tools:desugar_jdk_libs:%s' % library_version] |
| 534 | utils.PrintCmd(cmd) |
| 535 | subprocess.check_call(" ".join(cmd), shell=True) |
| 536 | cmd = ['tools/base/bazel/bazel', 'shutdown'] |
| 537 | utils.PrintCmd(cmd) |
| 538 | subprocess.check_call(cmd) |
| 539 | |
| 540 | prebuilts_tools = os.path.join(args.studio, 'prebuilts', 'tools') |
| 541 | with utils.ChangedWorkingDirectory(prebuilts_tools): |
| 542 | if not args.use_existing_work_branch: |
| 543 | with utils.ChangedWorkingDirectory(prebuilts_tools): |
| 544 | subprocess.check_call(['repo', 'start', change_name]) |
| 545 | m2_dir = os.path.join( |
| 546 | 'common', 'm2', 'repository', 'com', 'android', 'tools') |
| 547 | subprocess.check_call( |
| 548 | ['git', |
| 549 | 'add', |
| 550 | os.path.join(m2_dir, DESUGAR_JDK_LIBS, library_version)]) |
| 551 | subprocess.check_call( |
| 552 | ['git', |
| 553 | 'add', |
| 554 | os.path.join( |
| 555 | m2_dir, DESUGAR_JDK_LIBS_CONFIGURATION, configuration_version)]) |
| 556 | |
| 557 | git_message = ("""Update library desugaring dependencies |
| 558 | |
| 559 | com.android.tools:desugar_jdk_libs:%s |
| 560 | com.android.tools:desugar_jdk_libs_configuration:%s |
| 561 | |
| 562 | Bug: %s |
| 563 | Test: L8ToolTest, L8DexDesugarTest""" |
| 564 | % (library_version, |
| 565 | configuration_version, |
Ian Zerny | fec0009 | 2022-03-16 08:25:07 +0100 | [diff] [blame] | 566 | '\nBug: '.join(map(bug_fmt, args.bug)))) |
Søren Gjesse | 73355ec | 2020-06-29 09:19:44 +0200 | [diff] [blame] | 567 | |
| 568 | if not args.use_existing_work_branch: |
| 569 | subprocess.check_call(['git', 'commit', '-a', '-m', git_message]) |
| 570 | else: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 571 | print('Not committing when --use-existing-work-branch. ' |
Søren Gjesse | 73355ec | 2020-06-29 09:19:44 +0200 | [diff] [blame] | 572 | + 'Commit message should be:\n\n' |
| 573 | + git_message |
| 574 | + '\n') |
| 575 | # Don't upload if requested not to, or if changes are not committed due |
| 576 | # to --use-existing-work-branch |
| 577 | if not args.no_upload and not args.use_existing_work_branch: |
| 578 | process = subprocess.Popen(['repo', 'upload', '.', '--verify'], |
| 579 | stdin=subprocess.PIPE) |
| 580 | return process.communicate(input='y\n')[0] |
| 581 | |
| 582 | return make_release |
| 583 | |
| 584 | |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 585 | def prepare_desugar_library(args): |
| 586 | |
| 587 | def make_release(args): |
| 588 | library_version = args.desugar_library[0] |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 589 | configuration_version = args.desugar_library[1] |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 590 | |
Søren Gjesse | e78b165 | 2022-06-30 12:38:36 +0200 | [diff] [blame] | 591 | # TODO(b/237636871): Cleanup and generalize. |
Søren Gjesse | 3e45909 | 2023-01-05 09:40:28 +0100 | [diff] [blame] | 592 | if (not (library_version.startswith('1.1') |
| 593 | or library_version.startswith('1.2') |
| 594 | or library_version.startswith('2.0'))): |
Søren Gjesse | e78b165 | 2022-06-30 12:38:36 +0200 | [diff] [blame] | 595 | print("Release script does not support desugared library version %s" |
| 596 | % library_version) |
| 597 | sys.exit(1) |
| 598 | |
Søren Gjesse | 3e45909 | 2023-01-05 09:40:28 +0100 | [diff] [blame] | 599 | postfixes = [''] |
| 600 | if library_version.startswith('1.2'): |
| 601 | postfixes = ['_legacy'] |
| 602 | if library_version.startswith('2.0'): |
| 603 | postfixes = ['_minimal', '', '_nio'] |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 604 | |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 605 | with utils.TempDir() as temp: |
| 606 | with utils.ChangedWorkingDirectory(temp): |
Søren Gjesse | 3e45909 | 2023-01-05 09:40:28 +0100 | [diff] [blame] | 607 | artifacts = [] |
| 608 | for postfix in postfixes: |
| 609 | group_postfix = ('' if postfix == '_legacy' else postfix) |
| 610 | archive_postfix = (postfix if library_version.startswith('1.1') else '_jdk11' + postfix) |
| 611 | library_jar = DESUGAR_JDK_LIBS + postfix + '.jar' |
| 612 | library_archive = DESUGAR_JDK_LIBS + archive_postfix + '.zip' |
| 613 | configuration_archive = DESUGAR_JDK_LIBS_CONFIGURATION + archive_postfix + '.zip' |
| 614 | library_gfile = ('/bigstore/r8-releases/raw/%s/%s/%s' |
| 615 | % (DESUGAR_JDK_LIBS + group_postfix, library_version, library_archive)) |
| 616 | configuration_gfile = ('/bigstore/r8-releases/raw/main/%s/%s' |
| 617 | % (configuration_version, configuration_archive)) |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 618 | |
Søren Gjesse | 3e45909 | 2023-01-05 09:40:28 +0100 | [diff] [blame] | 619 | download_gfile(library_gfile, library_archive) |
| 620 | download_gfile(configuration_gfile, configuration_archive) |
| 621 | check_configuration(configuration_archive, group_postfix) |
| 622 | artifacts.append(library_gfile) |
| 623 | artifacts.append(configuration_gfile) |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 624 | |
Søren Gjesse | 3e45909 | 2023-01-05 09:40:28 +0100 | [diff] [blame] | 625 | release_id = gmaven_publisher_stage(args, artifacts) |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 626 | |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 627 | print("Staged Release ID " + release_id + ".\n") |
Søren Gjesse | f637d9d | 2022-08-24 15:32:55 +0200 | [diff] [blame] | 628 | library_artifact_id = \ |
| 629 | '%s:%s:%s' % (ANDROID_TOOLS_PACKAGE, DESUGAR_JDK_LIBS, library_version) |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 630 | gmaven_publisher_stage_redir_test_info( |
| 631 | release_id, |
Søren Gjesse | f637d9d | 2022-08-24 15:32:55 +0200 | [diff] [blame] | 632 | library_artifact_id, |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 633 | library_jar) |
| 634 | |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 635 | print("") |
Christoffer Quist Adamsen | d408d8d | 2021-01-26 19:50:39 +0100 | [diff] [blame] | 636 | answer = input("Continue with publishing [y/N]:") |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 637 | |
Christoffer Quist Adamsen | d408d8d | 2021-01-26 19:50:39 +0100 | [diff] [blame] | 638 | if answer != 'y': |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 639 | print('Aborting release to Google maven') |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 640 | sys.exit(1) |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 641 | |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 642 | gmaven_publisher_publish(args, release_id) |
| 643 | |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 644 | print("") |
| 645 | print("Published. Use the email workflow for approval.") |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 646 | |
| 647 | return make_release |
| 648 | |
| 649 | |
Søren Gjesse | 3e45909 | 2023-01-05 09:40:28 +0100 | [diff] [blame] | 650 | def check_configuration(configuration_archive, postfix): |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 651 | zip = zipfile.ZipFile(configuration_archive) |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 652 | zip.extractall() |
| 653 | dirs = os.listdir( |
Søren Gjesse | 3e45909 | 2023-01-05 09:40:28 +0100 | [diff] [blame] | 654 | os.path.join('com', 'android', 'tools', DESUGAR_JDK_LIBS_CONFIGURATION + postfix)) |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 655 | if len(dirs) != 1: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 656 | print('Unexpected archive content, %s' + dirs) |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 657 | sys.exit(1) |
| 658 | |
| 659 | version = dirs[0] |
| 660 | pom_file = os.path.join( |
| 661 | 'com', |
| 662 | 'android', |
| 663 | 'tools', |
Søren Gjesse | 3e45909 | 2023-01-05 09:40:28 +0100 | [diff] [blame] | 664 | DESUGAR_JDK_LIBS_CONFIGURATION + postfix, |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 665 | version, |
Søren Gjesse | 3e45909 | 2023-01-05 09:40:28 +0100 | [diff] [blame] | 666 | '%s-%s.pom' % (DESUGAR_JDK_LIBS_CONFIGURATION + postfix, version)) |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 667 | version_from_pom = extract_version_from_pom(pom_file) |
| 668 | if version != version_from_pom: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 669 | print('Version mismatch, %s != %s' % (version, version_from_pom)) |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 670 | sys.exit(1) |
Søren Gjesse | 07b6aea | 2019-12-12 11:11:58 +0100 | [diff] [blame] | 671 | |
| 672 | def check_no_google3_client(args, client_name): |
| 673 | if not args.use_existing_work_branch: |
Christoffer Quist Adamsen | d408d8d | 2021-01-26 19:50:39 +0100 | [diff] [blame] | 674 | clients = subprocess.check_output('g4 myclients', shell=True).decode('utf-8') |
Søren Gjesse | 07b6aea | 2019-12-12 11:11:58 +0100 | [diff] [blame] | 675 | if ':%s:' % client_name in clients: |
Søren Gjesse | e4f90c6 | 2022-06-27 12:47:45 +0200 | [diff] [blame] | 676 | if args.delete_work_branch: |
| 677 | subprocess.check_call('g4 citc -d -f %s' % client_name, shell=True) |
| 678 | else: |
| 679 | print(("Remove the existing '%s' client before continuing " + |
| 680 | "(force delete: 'g4 citc -d -f %s'), " + |
| 681 | "or use either --use-existing-work-branch or " + |
| 682 | "--delete-work-branch.") % (client_name, client_name)) |
| 683 | sys.exit(1) |
Søren Gjesse | 07b6aea | 2019-12-12 11:11:58 +0100 | [diff] [blame] | 684 | |
| 685 | |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 686 | def extract_version_from_pom(pom_file): |
| 687 | ns = "http://maven.apache.org/POM/4.0.0" |
| 688 | xml.etree.ElementTree.register_namespace('', ns) |
| 689 | tree = xml.etree.ElementTree.ElementTree() |
| 690 | tree.parse(pom_file) |
| 691 | return tree.getroot().find("{%s}version" % ns).text |
| 692 | |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 693 | |
| 694 | GMAVEN_PUBLISH_STAGE_RELEASE_ID_PATTERN = re.compile('Release ID = ([0-9a-f\-]+)') |
| 695 | |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 696 | |
| 697 | def gmaven_publisher_stage(args, gfiles): |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 698 | if args.dry_run: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 699 | print('Dry-run, would have staged %s' % gfiles) |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 700 | return 'dry-run-release-id' |
| 701 | |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 702 | print("Staging: %s" % ', '.join(gfiles)) |
| 703 | print("") |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 704 | |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 705 | cmd = [GMAVEN_PUBLISHER, 'stage', '--gfile', ','.join(gfiles)] |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 706 | output = subprocess.check_output(cmd) |
| 707 | |
| 708 | # Expect output to contain: |
| 709 | # [INFO] 06/19/2020 09:35:12 CEST: >>>>>>>>>> Staged |
| 710 | # [INFO] 06/19/2020 09:35:12 CEST: Release ID = 9171d015-18f6-4a90-9984-1c362589dc1b |
| 711 | # [INFO] 06/19/2020 09:35:12 CEST: Stage Path = /bigstore/studio_staging/maven2/sgjesse/9171d015-18f6-4a90-9984-1c362589dc1b |
| 712 | |
Søren Gjesse | 7b15111 | 2021-02-16 14:32:32 +0100 | [diff] [blame] | 713 | matches = GMAVEN_PUBLISH_STAGE_RELEASE_ID_PATTERN.findall(output.decode("utf-8")) |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 714 | if matches == None or len(matches) > 1: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 715 | print("Could not determine the release ID from the gmaven_publisher " + |
| 716 | "output. Expected a line with 'Release ID = <release id>'.") |
| 717 | print("Output was:") |
| 718 | print(output) |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 719 | sys.exit(1) |
| 720 | |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 721 | print(output) |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 722 | |
| 723 | release_id = matches[0] |
| 724 | return release_id |
| 725 | |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 726 | |
| 727 | def gmaven_publisher_stage_redir_test_info(release_id, artifact, dst): |
| 728 | |
| 729 | redir_command = ("/google/data/ro/teams/android-devtools-infra/tools/redir " |
| 730 | + "--alsologtostderr " |
Søren Gjesse | 44eee51 | 2021-09-24 11:44:11 +0200 | [diff] [blame] | 731 | + "--gcs_bucket_path=/bigstore/gmaven-staging/${USER}/%s " |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 732 | + "--port=1480") % release_id |
| 733 | |
| 734 | get_command = ("mvn org.apache.maven.plugins:maven-dependency-plugin:2.4:get " |
| 735 | + "-Dmaven.repo.local=/tmp/maven_repo_local " |
| 736 | + "-DremoteRepositories=http://localhost:1480 " |
| 737 | + "-Dartifact=%s " |
| 738 | + "-Ddest=%s") % (artifact, dst) |
| 739 | |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 740 | print("""To test the staged content with 'redir' run: |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 741 | |
| 742 | %s |
| 743 | |
Søren Gjesse | e78b165 | 2022-06-30 12:38:36 +0200 | [diff] [blame] | 744 | Then add the following repository to settings.gradle to search the 'redir' |
| 745 | repository: |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 746 | |
Søren Gjesse | e78b165 | 2022-06-30 12:38:36 +0200 | [diff] [blame] | 747 | dependencyResolutionManagement { |
| 748 | repositories { |
| 749 | maven { |
| 750 | url 'http://localhost:1480' |
| 751 | allowInsecureProtocol true |
| 752 | } |
Søren Gjesse | 44eee51 | 2021-09-24 11:44:11 +0200 | [diff] [blame] | 753 | } |
Søren Gjesse | e78b165 | 2022-06-30 12:38:36 +0200 | [diff] [blame] | 754 | } |
| 755 | |
| 756 | and add the following repository to gradle.build for for the staged version: |
| 757 | |
| 758 | dependencies { |
| 759 | coreLibraryDesugaring('%s') { |
| 760 | changing = true |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 761 | } |
| 762 | } |
| 763 | |
| 764 | Use this commands to get artifact from 'redir': |
| 765 | |
| 766 | rm -rf /tmp/maven_repo_local |
| 767 | %s |
Søren Gjesse | 44eee51 | 2021-09-24 11:44:11 +0200 | [diff] [blame] | 768 | """ % (redir_command, artifact, get_command)) |
Søren Gjesse | b093b67 | 2020-06-23 16:23:10 +0200 | [diff] [blame] | 769 | |
| 770 | |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 771 | def gmaven_publisher_publish(args, release_id): |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 772 | if args.dry_run: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 773 | print('Dry-run, would have published %s' % release_id) |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 774 | return |
| 775 | |
| 776 | cmd = [GMAVEN_PUBLISHER, 'publish', release_id] |
| 777 | output = subprocess.check_output(cmd) |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 778 | |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 779 | def branch_change_diff(diff, old_version, new_version): |
| 780 | invalid_line = None |
Søren Gjesse | 25ef552 | 2021-05-05 08:17:00 +0200 | [diff] [blame] | 781 | for line in str(diff).splitlines(): |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 782 | if line.startswith('-R8') and \ |
| 783 | line != "-R8_DEV_BRANCH = '%s'" % old_version: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 784 | print(line) |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 785 | invalid_line = line |
| 786 | elif line.startswith('+R8') and \ |
| 787 | line != "+R8_DEV_BRANCH = '%s'" % new_version: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 788 | print(line) |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 789 | invalid_line = line |
| 790 | return invalid_line |
| 791 | |
| 792 | |
| 793 | def validate_branch_change_diff(version_diff_output, old_version, new_version): |
| 794 | invalid = branch_change_diff(version_diff_output, old_version, new_version) |
| 795 | if invalid: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 796 | print("") |
| 797 | print("The diff for the branch change in tools/release.py is not as expected:") |
| 798 | print("") |
| 799 | print("=" * 80) |
| 800 | print(version_diff_output) |
| 801 | print("=" * 80) |
| 802 | print("") |
| 803 | print("Validate the uploaded CL before landing.") |
| 804 | print("") |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 805 | |
| 806 | |
Søren Gjesse | 4e5c6fe | 2019-11-05 17:17:43 +0100 | [diff] [blame] | 807 | def prepare_branch(args): |
| 808 | branch_version = args.new_dev_branch[0] |
| 809 | commithash = args.new_dev_branch[1] |
| 810 | |
| 811 | current_semver = utils.check_basic_semver_version( |
| 812 | R8_DEV_BRANCH, ", current release branch version should be x.y", 2) |
| 813 | semver = utils.check_basic_semver_version( |
| 814 | branch_version, ", release branch version should be x.y", 2) |
| 815 | if not semver.larger_than(current_semver): |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 816 | print('New branch version "' |
Søren Gjesse | 4e5c6fe | 2019-11-05 17:17:43 +0100 | [diff] [blame] | 817 | + branch_version |
| 818 | + '" must be strictly larger than the current "' |
| 819 | + R8_DEV_BRANCH |
| 820 | + '"') |
| 821 | sys.exit(1) |
| 822 | |
| 823 | def make_branch(options): |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 824 | with utils.TempDir() as temp: |
| 825 | subprocess.check_call(['git', 'clone', utils.REPO_SOURCE, temp]) |
| 826 | with utils.ChangedWorkingDirectory(temp): |
| 827 | subprocess.check_call(['git', 'branch', branch_version, commithash]) |
Søren Gjesse | 4e5c6fe | 2019-11-05 17:17:43 +0100 | [diff] [blame] | 828 | |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 829 | subprocess.check_call(['git', 'checkout', branch_version]) |
Søren Gjesse | 4e5c6fe | 2019-11-05 17:17:43 +0100 | [diff] [blame] | 830 | |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 831 | # Rewrite the version, commit and validate. |
Rico Wind | 1b52acf | 2021-03-21 12:36:55 +0100 | [diff] [blame] | 832 | old_version = 'main' |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 833 | full_version = branch_version + '.0-dev' |
Søren Gjesse | 61d8bf4 | 2023-04-18 17:33:19 +0200 | [diff] [blame] | 834 | version_prefix = 'public static final String LABEL = "' |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 835 | sed(version_prefix + old_version, |
| 836 | version_prefix + full_version, |
| 837 | R8_VERSION_FILE) |
Søren Gjesse | 4e5c6fe | 2019-11-05 17:17:43 +0100 | [diff] [blame] | 838 | |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 839 | subprocess.check_call([ |
| 840 | 'git', 'commit', '-a', '-m', 'Version %s' % full_version]) |
Søren Gjesse | 4e5c6fe | 2019-11-05 17:17:43 +0100 | [diff] [blame] | 841 | |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 842 | version_diff_output = subprocess.check_output([ |
| 843 | 'git', 'diff', '%s..HEAD' % commithash]) |
Søren Gjesse | 4e5c6fe | 2019-11-05 17:17:43 +0100 | [diff] [blame] | 844 | |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 845 | validate_version_change_diff(version_diff_output, old_version, full_version) |
Søren Gjesse | 4e5c6fe | 2019-11-05 17:17:43 +0100 | [diff] [blame] | 846 | |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 847 | # Double check that we want to create a new release branch. |
| 848 | if not options.dry_run: |
Christoffer Quist Adamsen | d408d8d | 2021-01-26 19:50:39 +0100 | [diff] [blame] | 849 | answer = input('Create new branch for %s [y/N]:' % branch_version) |
| 850 | if answer != 'y': |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 851 | print('Aborting new branch for %s' % branch_version) |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 852 | sys.exit(1) |
Søren Gjesse | 4e5c6fe | 2019-11-05 17:17:43 +0100 | [diff] [blame] | 853 | |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 854 | maybe_check_call(options, [ |
| 855 | 'git', 'push', 'origin', 'HEAD:%s' % branch_version]) |
| 856 | maybe_tag(options, full_version) |
Søren Gjesse | 4e5c6fe | 2019-11-05 17:17:43 +0100 | [diff] [blame] | 857 | |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 858 | print('Updating tools/r8_release.py to make new dev releases on %s' |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 859 | % branch_version) |
| 860 | |
| 861 | subprocess.check_call(['git', 'new-branch', 'update-release-script']) |
| 862 | |
| 863 | # Check this file for the setting of the current dev branch. |
| 864 | result = None |
Søren Gjesse | 2725159 | 2019-11-06 17:35:23 +0100 | [diff] [blame] | 865 | for line in open(THIS_FILE_RELATIVE, 'r'): |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 866 | result = re.match( |
| 867 | r"^R8_DEV_BRANCH = '(\d+).(\d+)'", line) |
| 868 | if result: |
| 869 | break |
| 870 | if not result or not result.group(1): |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 871 | print('Failed to find version label in %s' % THIS_FILE_RELATIVE) |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 872 | sys.exit(1) |
| 873 | |
| 874 | # Update this file with the new dev branch. |
| 875 | sed("R8_DEV_BRANCH = '%s.%s" % (result.group(1), result.group(2)), |
| 876 | "R8_DEV_BRANCH = '%s.%s" % (str(semver.major), str(semver.minor)), |
Søren Gjesse | 2725159 | 2019-11-06 17:35:23 +0100 | [diff] [blame] | 877 | THIS_FILE_RELATIVE) |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 878 | |
Søren Gjesse | 2725159 | 2019-11-06 17:35:23 +0100 | [diff] [blame] | 879 | message = \ |
| 880 | 'Prepare %s for branch %s' % (THIS_FILE_RELATIVE, branch_version) |
Søren Gjesse | ddeb02e | 2019-11-06 15:48:07 +0100 | [diff] [blame] | 881 | subprocess.check_call(['git', 'commit', '-a', '-m', message]) |
| 882 | |
| 883 | branch_diff_output = subprocess.check_output(['git', 'diff', 'HEAD~']) |
| 884 | |
| 885 | validate_branch_change_diff( |
| 886 | branch_diff_output, R8_DEV_BRANCH, branch_version) |
| 887 | |
| 888 | maybe_check_call(options, ['git', 'cl', 'upload', '-f', '-m', message]) |
| 889 | |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 890 | print('') |
| 891 | print('Make sure to send out the branch change CL for review.') |
| 892 | print('') |
Søren Gjesse | 4e5c6fe | 2019-11-05 17:17:43 +0100 | [diff] [blame] | 893 | |
| 894 | return make_branch |
| 895 | |
| 896 | |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 897 | def parse_options(): |
| 898 | result = argparse.ArgumentParser(description='Release r8') |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 899 | group = result.add_mutually_exclusive_group() |
| 900 | group.add_argument('--dev-release', |
Rico Wind | 1b52acf | 2021-03-21 12:36:55 +0100 | [diff] [blame] | 901 | metavar=('<main hash>'), |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 902 | help='The hash to use for the new dev version of R8') |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 903 | group.add_argument('--version', |
| 904 | metavar=('<version>'), |
| 905 | help='The new version of R8 (e.g., 1.4.51) to release to selected channels') |
| 906 | group.add_argument('--desugar-library', |
| 907 | nargs=2, |
| 908 | metavar=('<version>', '<configuration hash>'), |
| 909 | help='The new version of com.android.tools:desugar_jdk_libs') |
Søren Gjesse | 73355ec | 2020-06-29 09:19:44 +0200 | [diff] [blame] | 910 | group.add_argument('--update-desugar-library-in-studio', |
| 911 | nargs=2, |
| 912 | metavar=('<version>', '<configuration version>'), |
| 913 | help='Update studio mirror of com.android.tools:desugar_jdk_libs') |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 914 | group.add_argument('--new-dev-branch', |
| 915 | nargs=2, |
Rico Wind | 1b52acf | 2021-03-21 12:36:55 +0100 | [diff] [blame] | 916 | metavar=('<version>', '<main hash>'), |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 917 | help='Create a new branch starting a version line (e.g. 2.0)') |
Rico Wind | 140a564 | 2019-11-26 10:44:21 +0100 | [diff] [blame] | 918 | result.add_argument('--dev-pre-cherry-pick', |
Rico Wind | 1b52acf | 2021-03-21 12:36:55 +0100 | [diff] [blame] | 919 | metavar=('<main hash(s)>'), |
Rico Wind | 140a564 | 2019-11-26 10:44:21 +0100 | [diff] [blame] | 920 | default=[], |
| 921 | action='append', |
| 922 | help='List of commits to cherry pick before doing full ' |
| 923 | 'merge, mostly used for reverting cherry picks') |
Søren Gjesse | b8dec61 | 2019-10-10 09:15:43 +0200 | [diff] [blame] | 924 | result.add_argument('--no-sync', '--no_sync', |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 925 | default=False, |
| 926 | action='store_true', |
| 927 | help='Do not sync repos before uploading') |
Morten Krogh-Jespersen | a1396cd | 2019-10-02 16:14:40 +0200 | [diff] [blame] | 928 | result.add_argument('--bug', |
Søren Gjesse | 53539ae | 2019-11-06 09:47:01 +0100 | [diff] [blame] | 929 | metavar=('<bug(s)>'), |
Morten Krogh-Jespersen | a1396cd | 2019-10-02 16:14:40 +0200 | [diff] [blame] | 930 | default=[], |
| 931 | action='append', |
| 932 | help='List of bugs for release version') |
Søren Gjesse | 5aa4a68 | 2022-08-26 09:17:27 +0200 | [diff] [blame] | 933 | result.add_argument('--no-bugs', |
| 934 | default=False, |
| 935 | action='store_true', |
| 936 | help='Allow Studio release without specifying any bugs') |
Morten Krogh-Jespersen | 00db27f | 2019-10-02 16:14:46 +0200 | [diff] [blame] | 937 | result.add_argument('--studio', |
Søren Gjesse | 53539ae | 2019-11-06 09:47:01 +0100 | [diff] [blame] | 938 | metavar=('<path>'), |
Morten Krogh-Jespersen | 00db27f | 2019-10-02 16:14:46 +0200 | [diff] [blame] | 939 | help='Release for studio by setting the path to a studio ' |
| 940 | 'checkout') |
| 941 | result.add_argument('--aosp', |
Søren Gjesse | 53539ae | 2019-11-06 09:47:01 +0100 | [diff] [blame] | 942 | metavar=('<path>'), |
Morten Krogh-Jespersen | 00db27f | 2019-10-02 16:14:46 +0200 | [diff] [blame] | 943 | help='Release for aosp by setting the path to the ' |
| 944 | 'checkout') |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 945 | result.add_argument('--maven', |
| 946 | default=False, |
| 947 | action='store_true', |
| 948 | help='Release to Google Maven') |
Morten Krogh-Jespersen | 00db27f | 2019-10-02 16:14:46 +0200 | [diff] [blame] | 949 | result.add_argument('--google3', |
| 950 | default=False, |
| 951 | action='store_true', |
| 952 | help='Release for google 3') |
Morten Krogh-Jespersen | 0452794 | 2022-08-02 13:50:11 +0200 | [diff] [blame] | 953 | result.add_argument('--google3retrace', |
| 954 | default=False, |
| 955 | action='store_true', |
| 956 | help='Release retrace for google 3') |
Søren Gjesse | 0896766 | 2020-05-06 19:46:32 +0200 | [diff] [blame] | 957 | result.add_argument('--p4-client', |
| 958 | default='update-r8', |
| 959 | metavar=('<client name>'), |
| 960 | help='P4 client name for google 3') |
Søren Gjesse | 5f90ec4 | 2019-12-02 16:03:51 +0100 | [diff] [blame] | 961 | result.add_argument('--use-existing-work-branch', '--use_existing_work_branch', |
| 962 | default=False, |
| 963 | action='store_true', |
| 964 | help='Use existing work branch/CL in aosp/studio/google3') |
Søren Gjesse | e4f90c6 | 2022-06-27 12:47:45 +0200 | [diff] [blame] | 965 | result.add_argument('--delete-work-branch', '--delete_work_branch', |
| 966 | default=False, |
| 967 | action='store_true', |
| 968 | help='Delete CL in google3') |
Søren Gjesse | 5f90ec4 | 2019-12-02 16:03:51 +0100 | [diff] [blame] | 969 | result.add_argument('--no-upload', '--no_upload', |
| 970 | default=False, |
| 971 | action='store_true', |
| 972 | help="Don't upload for code review") |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 973 | result.add_argument('--dry-run', |
| 974 | default=False, |
| 975 | action='store_true', |
| 976 | help='Only perform non-commiting tasks and print others.') |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 977 | result.add_argument('--dry-run-output', '--dry_run_output', |
| 978 | default=os.getcwd(), |
| 979 | metavar=('<path>'), |
| 980 | help='Location for dry run output.') |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 981 | args = result.parse_args() |
Søren Gjesse | 5aa4a68 | 2022-08-26 09:17:27 +0200 | [diff] [blame] | 982 | if (len(args.bug) > 0 and args.no_bugs): |
| 983 | print("Use of '--bug' and '--no-bugs' are mutually exclusive") |
| 984 | sys.exit(1) |
| 985 | |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 986 | if (args.studio |
| 987 | and args.version |
| 988 | and not 'dev' in args.version |
Søren Gjesse | 5aa4a68 | 2022-08-26 09:17:27 +0200 | [diff] [blame] | 989 | and args.bug == [] |
| 990 | and not args.no_bugs): |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 991 | print("When releasing a release version to Android Studio add the " |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 992 | + "list of bugs by using '--bug'") |
Morten Krogh-Jespersen | a1396cd | 2019-10-02 16:14:40 +0200 | [diff] [blame] | 993 | sys.exit(1) |
| 994 | |
Morten Krogh-Jespersen | 52d3ab0 | 2019-10-29 08:57:06 +0100 | [diff] [blame] | 995 | if args.version and not 'dev' in args.version and args.google3: |
Ian Zerny | 86c4cfd | 2022-01-17 13:43:37 +0100 | [diff] [blame] | 996 | print("WARNING: You should not roll a release version into google 3") |
Morten Krogh-Jespersen | 52d3ab0 | 2019-10-29 08:57:06 +0100 | [diff] [blame] | 997 | |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 998 | return args |
| 999 | |
| 1000 | |
| 1001 | def main(): |
| 1002 | args = parse_options() |
| 1003 | targets_to_run = [] |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 1004 | |
Søren Gjesse | 4e5c6fe | 2019-11-05 17:17:43 +0100 | [diff] [blame] | 1005 | if args.new_dev_branch: |
| 1006 | if args.google3 or args.studio or args.aosp: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 1007 | print('Cannot create a branch and roll at the same time.') |
Søren Gjesse | 4e5c6fe | 2019-11-05 17:17:43 +0100 | [diff] [blame] | 1008 | sys.exit(1) |
| 1009 | targets_to_run.append(prepare_branch(args)) |
| 1010 | |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 1011 | if args.dev_release: |
| 1012 | if args.google3 or args.studio or args.aosp: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 1013 | print('Cannot create a dev release and roll at the same time.') |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 1014 | sys.exit(1) |
| 1015 | targets_to_run.append(prepare_release(args)) |
| 1016 | |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 1017 | if (args.google3 |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 1018 | or args.maven |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 1019 | or (args.studio and not args.no_sync) |
Søren Gjesse | 53ef917 | 2020-06-10 15:04:01 +0200 | [diff] [blame] | 1020 | or (args.desugar_library and not args.dry_run)): |
Morten Krogh-Jespersen | ec3047b | 2020-08-18 13:09:06 +0200 | [diff] [blame] | 1021 | utils.check_gcert() |
Søren Gjesse | b8dec61 | 2019-10-10 09:15:43 +0200 | [diff] [blame] | 1022 | |
Morten Krogh-Jespersen | 00db27f | 2019-10-02 16:14:46 +0200 | [diff] [blame] | 1023 | if args.google3: |
Ian Zerny | 59dfa4c | 2019-10-25 10:34:36 +0200 | [diff] [blame] | 1024 | targets_to_run.append(prepare_google3(args)) |
Morten Krogh-Jespersen | 0452794 | 2022-08-02 13:50:11 +0200 | [diff] [blame] | 1025 | if args.google3retrace: |
| 1026 | targets_to_run.append(prepare_google3_retrace(args)) |
Søren Gjesse | 73355ec | 2020-06-29 09:19:44 +0200 | [diff] [blame] | 1027 | if args.studio and not args.update_desugar_library_in_studio: |
Morten Krogh-Jespersen | b4a7acc | 2019-10-02 10:46:32 +0200 | [diff] [blame] | 1028 | targets_to_run.append(prepare_studio(args)) |
Morten Krogh-Jespersen | 00db27f | 2019-10-02 16:14:46 +0200 | [diff] [blame] | 1029 | if args.aosp: |
Morten Krogh-Jespersen | b4a7acc | 2019-10-02 10:46:32 +0200 | [diff] [blame] | 1030 | targets_to_run.append(prepare_aosp(args)) |
Søren Gjesse | 376b74c | 2020-06-22 08:42:44 +0200 | [diff] [blame] | 1031 | if args.maven: |
| 1032 | targets_to_run.append(prepare_maven(args)) |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 1033 | |
Søren Gjesse | 975c5df | 2019-12-10 13:48:05 +0100 | [diff] [blame] | 1034 | if args.desugar_library: |
| 1035 | targets_to_run.append(prepare_desugar_library(args)) |
| 1036 | |
Søren Gjesse | 73355ec | 2020-06-29 09:19:44 +0200 | [diff] [blame] | 1037 | if args.update_desugar_library_in_studio: |
| 1038 | if not args.studio: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 1039 | print("--studio required") |
Søren Gjesse | 73355ec | 2020-06-29 09:19:44 +0200 | [diff] [blame] | 1040 | sys.exit(1) |
| 1041 | if args.bug == []: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 1042 | print("Update studio mirror of com.android.tools:desugar_jdk_libs " |
Søren Gjesse | 73355ec | 2020-06-29 09:19:44 +0200 | [diff] [blame] | 1043 | + "requires at least one bug by using '--bug'") |
| 1044 | sys.exit(1) |
| 1045 | targets_to_run.append(update_desugar_library_in_studio(args)) |
| 1046 | |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 1047 | final_results = [] |
| 1048 | for target_closure in targets_to_run: |
| 1049 | final_results.append(target_closure(args)) |
| 1050 | |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 1051 | print('\n\n**************************************************************') |
| 1052 | print('PRINTING SUMMARY') |
| 1053 | print('**************************************************************\n\n') |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 1054 | |
| 1055 | for result in final_results: |
| 1056 | if result is not None: |
Morten Krogh-Jespersen | 8a4d1ca | 2021-01-19 08:27:02 +0100 | [diff] [blame] | 1057 | print(result) |
Morten Krogh-Jespersen | 1947a86 | 2019-09-26 14:06:48 +0200 | [diff] [blame] | 1058 | |
| 1059 | |
| 1060 | if __name__ == '__main__': |
| 1061 | sys.exit(main()) |