1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
|
#!/usr/bin/env python3
# Copyright (c) 2016 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
"""This script takes a Clang git revision as an argument, it then
creates a feature branch, puts this revision into update.py, uploads
a CL, triggers Clang Upload try bots, and tells what to do next"""
from __future__ import print_function
import argparse
import fnmatch
import itertools
import os
import re
import shutil
import subprocess
import sys
from build import CheckoutLLVM, GetCommitDescription, LLVM_DIR
from update import CHROMIUM_DIR
# Path constants.
THIS_DIR = os.path.dirname(__file__)
UPDATE_PY_PATH = os.path.join(THIS_DIR, "update.py")
CHROMIUM_DIR = os.path.abspath(os.path.join(THIS_DIR, '..', '..', '..'))
# Keep lines in here at <= 72 columns, else they wrap in gerrit.
COMMIT_FOOTER = \
'''
Bug: TODO. Remove the Tricium: line below when filling this in.
Tricium: skip
Cq-Include-Trybots: chromium/try:android-asan
Cq-Include-Trybots: chromium/try:chromeos-amd64-generic-cfi-thin-lto-rel
Cq-Include-Trybots: chromium/try:dawn-win10-x86-deps-rel
Cq-Include-Trybots: chromium/try:linux-chromeos-dbg
Cq-Include-Trybots: chromium/try:linux_chromium_cfi_rel_ng
Cq-Include-Trybots: chromium/try:linux_chromium_chromeos_msan_rel_ng
Cq-Include-Trybots: chromium/try:linux_chromium_msan_rel_ng
Cq-Include-Trybots: chromium/try:mac11-arm64-rel,mac_chromium_asan_rel_ng
Cq-Include-Trybots: chromium/try:win-asan,win7-rel
Cq-Include-Trybots: chromium/try:android-official,fuchsia-official
Cq-Include-Trybots: chromium/try:mac-official,linux-official
Cq-Include-Trybots: chromium/try:win-official,win32-official
Cq-Include-Trybots: chromium/try:linux-swangle-try-x64,win-swangle-try-x86
Cq-Include-Trybots: chrome/try:iphone-device,ipad-device
Cq-Include-Trybots: chrome/try:linux-chromeos-chrome
Cq-Include-Trybots: chrome/try:win-chrome,win64-chrome,linux-chrome,mac-chrome
Cq-Include-Trybots: chrome/try:linux-pgo,mac-pgo,win32-pgo,win64-pgo
'''
is_win = sys.platform.startswith('win32')
def PatchRevision(clang_git_revision, clang_sub_revision):
with open(UPDATE_PY_PATH) as f:
content = f.read()
m = re.search("CLANG_REVISION = '([0-9a-z-]+)'", content)
clang_old_git_revision = m.group(1)
m = re.search("CLANG_SUB_REVISION = ([0-9]+)", content)
clang_old_sub_revision = m.group(1)
content = re.sub("CLANG_REVISION = '[0-9a-z-]+'",
"CLANG_REVISION = '{}'".format(clang_git_revision),
content,
count=1)
content = re.sub("CLANG_SUB_REVISION = [0-9]+",
"CLANG_SUB_REVISION = {}".format(clang_sub_revision),
content, count=1)
with open(UPDATE_PY_PATH, 'w') as f:
f.write(content)
return "{}-{}".format(clang_old_git_revision, clang_old_sub_revision)
def Git(args):
# Needs shell=True on Windows due to git.bat in depot_tools.
subprocess.check_call(["git"] + args, shell=is_win)
def main():
parser = argparse.ArgumentParser(description='upload new clang revision')
parser.add_argument('clang_git_revision', nargs=1,
help='Clang git revision to build the toolchain for.')
parser.add_argument('clang_sub_revision',
type=int, nargs='?', default=1,
help='Clang sub-revision to build the toolchain for.')
args = parser.parse_args()
clang_raw_git_revision = args.clang_git_revision[0]
# To `git describe`, we need a checkout.
CheckoutLLVM(clang_raw_git_revision, LLVM_DIR)
clang_git_revision = GetCommitDescription(clang_raw_git_revision)
clang_sub_revision = args.clang_sub_revision
os.chdir(CHROMIUM_DIR)
print("Making a patch for Clang {}-{}".format(clang_git_revision,
clang_sub_revision))
rev_string = "{}-{}".format(clang_git_revision, clang_sub_revision)
Git(["checkout", "origin/main", "-b", "clang-{}".format(rev_string)])
old_rev_string = PatchRevision(clang_git_revision, clang_sub_revision)
Git(["add", UPDATE_PY_PATH])
commit_message = 'Ran `{}`.'.format(' '.join(sys.argv)) + COMMIT_FOOTER
Git([
"commit", "-m",
"Roll clang {} : {}\n\n{}".format(old_rev_string, rev_string,
commit_message)
])
Git(["cl", "upload", "-f", "--bypass-hooks"])
Git([
"cl", "try", "-B", "chromium/try", "-b", "linux_upload_clang", "-b",
"mac_upload_clang", "-b", "mac_upload_clang_arm", "-b", "win_upload_clang"
])
print ("Please, wait until the try bots succeeded "
"and then push the binaries to goma.")
if __name__ == '__main__':
sys.exit(main())
|
