Skip to content

Commit 5614026

Browse files
committed
[build] improve automated update task
1 parent 8957fb5 commit 5614026

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

Rakefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@ namespace :java do
935935
file = 'java/version.bzl'
936936
text = File.read(file).gsub(old_version, new_version)
937937
File.open(file, "w") { |f| f.puts text }
938-
Rake::Task['java:changelog'].invoke unless old_version.include?('SNAPSHOT')
938+
Rake::Task['java:changelog'].invoke if old_version.include?('SNAPSHOT')
939939
end
940940
end
941941

@@ -1043,7 +1043,7 @@ namespace :all do
10431043
Bazel.execute('run', args, '//scripts:update_cdp')
10441044
Bazel.execute('run', args, '//scripts:pinned_browsers')
10451045
Bazel.execute('run', args, '//scripts:selenium_manager')
1046-
Rake::Task['java:dependencies'].invoke
1046+
Rake::Task['java:update'].invoke
10471047
Rake::Task['authors'].invoke
10481048
Rake::Task['copyright:update'].invoke
10491049
end

scripts/update_cdp.py

+13-13
Original file line numberDiff line numberDiff line change
@@ -103,22 +103,20 @@ def create_new_chrome_files(src_base, chrome_milestone):
103103
target_dir = root_dir / f"{src_base}/v{new_chrome(chrome_milestone)}"
104104
old_dir = root_dir / f"{src_base}/v{old_chrome(chrome_milestone)}"
105105

106-
# New target must not be already present
107-
if not target_dir.is_dir():
108-
if old_dir.is_dir():
109-
shutil.rmtree(old_dir)
106+
if old_dir.is_dir():
107+
shutil.rmtree(old_dir)
110108

111-
if source_dir.is_dir() and any(source_dir.iterdir()):
112-
os.makedirs(target_dir, exist_ok=True)
113-
for item in source_dir.iterdir():
114-
shutil.copy(item, target_dir)
109+
if source_dir.is_dir() and any(source_dir.iterdir()):
110+
os.makedirs(target_dir, exist_ok=True)
111+
for item in source_dir.iterdir():
112+
shutil.copy(item, target_dir)
115113

116-
for file in target_dir.iterdir():
117-
replace_in_file(file, previous_chrome(chrome_milestone), new_chrome(chrome_milestone))
118-
new_filename = file.name.replace(previous_chrome(chrome_milestone), new_chrome(chrome_milestone))
119-
file.rename(target_dir / new_filename)
114+
for file in target_dir.iterdir():
115+
replace_in_file(file, previous_chrome(chrome_milestone), new_chrome(chrome_milestone))
116+
new_filename = file.name.replace(previous_chrome(chrome_milestone), new_chrome(chrome_milestone))
117+
file.rename(target_dir / new_filename)
120118

121-
subprocess.run(["git", "add", str(target_dir / "*")], cwd=root_dir)
119+
subprocess.run(["git", "add", str(target_dir / "*")], cwd=root_dir)
122120

123121

124122
def replace_in_file(file_path, old_string, new_string, is_regex=False):
@@ -187,3 +185,5 @@ def update_js(chrome_milestone):
187185
update_ruby(chrome_milestone)
188186
update_python(chrome_milestone)
189187
update_js(chrome_milestone)
188+
189+
print(f"adding CDP {new_chrome(chrome_milestone)} and removing {old_chrome(chrome_milestone)}")

0 commit comments

Comments
 (0)