diff --git a/Rakefile b/Rakefile index f331a795a7bc8..078c9c95171a0 100644 --- a/Rakefile +++ b/Rakefile @@ -935,7 +935,7 @@ namespace :java do file = 'java/version.bzl' text = File.read(file).gsub(old_version, new_version) File.open(file, "w") { |f| f.puts text } - Rake::Task['java:changelog'].invoke unless old_version.include?('SNAPSHOT') + Rake::Task['java:changelog'].invoke if old_version.include?('SNAPSHOT') end end @@ -1043,7 +1043,7 @@ namespace :all do Bazel.execute('run', args, '//scripts:update_cdp') Bazel.execute('run', args, '//scripts:pinned_browsers') Bazel.execute('run', args, '//scripts:selenium_manager') - Rake::Task['java:dependencies'].invoke + Rake::Task['java:update'].invoke Rake::Task['authors'].invoke Rake::Task['copyright:update'].invoke end diff --git a/scripts/update_cdp.py b/scripts/update_cdp.py index 0fc60e255b513..a43a9bca2963f 100755 --- a/scripts/update_cdp.py +++ b/scripts/update_cdp.py @@ -103,22 +103,20 @@ def create_new_chrome_files(src_base, chrome_milestone): target_dir = root_dir / f"{src_base}/v{new_chrome(chrome_milestone)}" old_dir = root_dir / f"{src_base}/v{old_chrome(chrome_milestone)}" - # New target must not be already present - if not target_dir.is_dir(): - if old_dir.is_dir(): - shutil.rmtree(old_dir) + if old_dir.is_dir(): + shutil.rmtree(old_dir) - if source_dir.is_dir() and any(source_dir.iterdir()): - os.makedirs(target_dir, exist_ok=True) - for item in source_dir.iterdir(): - shutil.copy(item, target_dir) + if source_dir.is_dir() and any(source_dir.iterdir()): + os.makedirs(target_dir, exist_ok=True) + for item in source_dir.iterdir(): + shutil.copy(item, target_dir) - for file in target_dir.iterdir(): - replace_in_file(file, previous_chrome(chrome_milestone), new_chrome(chrome_milestone)) - new_filename = file.name.replace(previous_chrome(chrome_milestone), new_chrome(chrome_milestone)) - file.rename(target_dir / new_filename) + for file in target_dir.iterdir(): + replace_in_file(file, previous_chrome(chrome_milestone), new_chrome(chrome_milestone)) + new_filename = file.name.replace(previous_chrome(chrome_milestone), new_chrome(chrome_milestone)) + file.rename(target_dir / new_filename) - subprocess.run(["git", "add", str(target_dir / "*")], cwd=root_dir) + subprocess.run(["git", "add", str(target_dir / "*")], cwd=root_dir) def replace_in_file(file_path, old_string, new_string, is_regex=False): @@ -187,3 +185,5 @@ def update_js(chrome_milestone): update_ruby(chrome_milestone) update_python(chrome_milestone) update_js(chrome_milestone) + + print(f"adding CDP {new_chrome(chrome_milestone)} and removing {old_chrome(chrome_milestone)}")