Skip to content

Commit 7bec7b4

Browse files
committedJan 23, 2024
[build] fixes to automated release tasks
1 parent 5404e6d commit 7bec7b4

File tree

1 file changed

+42
-35
lines changed

1 file changed

+42
-35
lines changed
 

‎Rakefile

+42-35
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ namespace :node do
525525

526526
desc 'Build Node npm package'
527527
task :build, [:args] do |_task, arguments|
528-
args = arguments[:args] ? [arguments[:args]] : []
528+
args = arguments[:args] || []
529529
Bazel.execute('build', args, '//javascript/node/selenium-webdriver')
530530
end
531531

@@ -573,16 +573,16 @@ end
573573
namespace :py do
574574
desc 'Build Python wheel and sdist with optional arguments'
575575
task :build, [:args] do |_task, arguments|
576-
args = arguments[:args] ? [arguments[:args]] : []
576+
args = arguments[:args] || []
577577
Bazel.execute('build', args, '//py:selenium-wheel')
578578
Bazel.execute('build', args, '//py:selenium-sdist')
579579
end
580580

581581
desc 'Release Python wheel and sdist to pypi'
582582
task :release, [:args] do |_task, arguments|
583-
args = arguments[:args] ? [arguments[:args]] : ['--stamp']
583+
args = arguments[:args] || ['--stamp']
584584
Rake::Task['py:build'].invoke(args)
585-
sh "python3 -m twine upload `bazel-bin/py/selenium`-#{python_version}-py3-none-any.whl"
585+
sh "python3 -m twine upload bazel-bin/py/selenium-#{python_version}-py3-none-any.whl"
586586
sh "python3 -m twine upload bazel-bin/py/selenium-#{python_version}.tar.gz"
587587
end
588588

@@ -707,7 +707,7 @@ end
707707
namespace :rb do
708708
desc 'Generate Ruby gems'
709709
task :build, [:args] do |_task, arguments|
710-
args = arguments[:args] ? [arguments[:args]] : []
710+
args = arguments[:args] || []
711711
Bazel.execute('build', args, '//rb:selenium-webdriver')
712712
Bazel.execute('build', args, '//rb:selenium-devtools')
713713
end
@@ -721,9 +721,9 @@ namespace :rb do
721721

722722
desc 'Push Ruby gems to rubygems'
723723
task :release, [:args] do |_task, arguments|
724-
args = arguments[:args] ? [arguments[:args]] : ['--stamp']
725-
Bazel.execute('run', args, '//rb:selenium-webdriver')
726-
Bazel.execute('run', args, '//rb:selenium-devtools')
724+
args = arguments[:args] || ['--stamp']
725+
Bazel.execute('run', args, '//rb:selenium-webdriver-release')
726+
Bazel.execute('run', args, '//rb:selenium-devtools-release')
727727
end
728728

729729
desc 'Generate Ruby documentation'
@@ -772,13 +772,13 @@ end
772772
namespace :dotnet do
773773
desc 'Build nupkg files'
774774
task :build, [:args] do |_task, arguments|
775-
args = arguments[:args] ? [arguments[:args]] : []
775+
args = arguments[:args] || []
776776
Bazel.execute('build', args, '//dotnet:all')
777777
end
778778

779779
desc 'Create zipped assets for .NET for uploading to GitHub'
780780
task :zip_assets, [:args] do |_task, arguments|
781-
args = arguments[:args] ? [arguments[:args]] : ['--stamp']
781+
args = arguments[:args] || ['--stamp']
782782
Rake::Task['dotnet:build'].invoke(args)
783783
mkdir_p 'build/dist'
784784
FileUtils.rm_f('build/dist/*dotnet*')
@@ -791,7 +791,7 @@ namespace :dotnet do
791791

792792
desc 'Upload nupkg files to Nuget'
793793
task :release, [:args] do |_task, arguments|
794-
args = arguments[:args] ? [arguments[:args]] : ['--stamp']
794+
args = arguments[:args] || ['--stamp']
795795
Rake::Task['dotnet:build'].invoke(args)
796796
Rake::Task['dotnet:zip_assets'].invoke(args)
797797

@@ -852,26 +852,26 @@ end
852852
namespace :java do
853853
desc 'Build Java Client Jars'
854854
task :build, [:args] do |_task, arguments|
855-
args = arguments[:args] ? [arguments[:args]] : []
855+
args = arguments[:args] || []
856856
Bazel.execute('build', args, '//java/src/org/openqa/selenium:client-combined')
857857
end
858858

859859
desc 'Build Grid Jar'
860860
task :grid, [:args] do |_task, arguments|
861-
args = arguments[:args] ? [arguments[:args]] : []
861+
args = arguments[:args] || []
862862
Bazel.execute('build', args, '//java/src/org/openqa/selenium/grid:grid')
863863
end
864864

865865
desc 'Package Java bindings and grid into releasable packages'
866866
task :package, [:args] do |_task, arguments|
867-
args = arguments[:args] ? [arguments[:args]] : []
867+
args = arguments[:args] || []
868868
Rake::Task['java:build'].invoke(args)
869869
Rake::Task['java-release-zip'].invoke
870870
end
871871

872872
desc 'Deploy all jars to Maven'
873873
task :release, [:args] do |_task, arguments|
874-
args = arguments[:args] ? [arguments[:args]] : ['--stamp']
874+
args = arguments[:args] || ['--stamp']
875875
Rake::Task['java:package'].invoke(args)
876876
Rake::Task['publish-maven'].invoke
877877
end
@@ -947,7 +947,7 @@ end
947947
namespace :rust do
948948
desc 'Build Selenium Manager'
949949
task :build, [:args] do |_task, arguments|
950-
args = arguments[:args] ? [arguments[:args]] : []
950+
args = arguments[:args] || []
951951
Bazel.execute('build', args, '//rust:selenium-manager')
952952
end
953953

@@ -1002,7 +1002,7 @@ namespace :all do
10021002

10031003
desc 'Build all artifacts for all language bindings'
10041004
task :build, [:args] do |_task, arguments|
1005-
args = arguments[:args] ? [arguments[:args]] : []
1005+
args = arguments[:args] || []
10061006
Rake::Task['java:build'].invoke(args)
10071007
Rake::Task['py:build'].invoke(args)
10081008
Rake::Task['rb:build'].invoke(args)
@@ -1016,23 +1016,30 @@ namespace :all do
10161016
tag = @git.add_tag("selenium-#{java_version}")
10171017
@git.push('origin', tag.name)
10181018

1019-
args = arguments[:args] ? [arguments[:args]] : ['--stamp']
1019+
args = arguments[:args] || ['--stamp']
10201020
Rake::Task['java:release'].invoke(args)
10211021
Rake::Task['py:release'].invoke(args)
10221022
Rake::Task['rb:release'].invoke(args)
10231023
Rake::Task['dotnet:release'].invoke(args)
10241024
Rake::Task['node:release'].invoke(args)
10251025
Rake::Task['create_release_notes'].invoke(args)
10261026
Rake::Task['all:docs'].invoke
1027-
Rake::Task['all:version'].invoke(['nightly'])
1027+
Rake::Task['all:version'].invoke('nightly')
10281028

10291029
puts "Staging nightly version updates"
1030-
@git.add(['java/version.bzl', 'rb/lib/selenium/webdriver/version.rb'], all: true)
1030+
@git.add(['java/version.bzl',
1031+
'rb/lib/selenium/webdriver/version.rb',
1032+
'rb/Gemfile.lock',
1033+
'rust/BUILD.bazel',
1034+
'rust/Cargo.Bazel.lock',
1035+
'rust/Cargo.lock',
1036+
'rust/Cargo.toml'],
1037+
all: true)
10311038
puts "Committing nightly version updates"
1032-
@git.commit('updating versions to nightly')
1039+
@git.commit('update versions to nightly')
10331040
puts "Pushing changes to upstream repository"
10341041

1035-
print 'Do you want to commit the changes? (Y/n): '
1042+
print 'Do you want to push the committed changes? (Y/n): '
10361043
response = STDIN.gets.chomp.downcase
10371044
@git.push if response == 'y' || response == 'yes'
10381045
end
@@ -1078,23 +1085,23 @@ task :create_release_notes do
10781085
git_log_output = `#{git_log_command}`
10791086

10801087
release_notes = <<~RELEASE_NOTES
1081-
### Changelog
1088+
### Changelog
10821089
1083-
For each component's detailed changelog, please check:
1084-
* [Ruby](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES)
1085-
* [Python](https://github.com/SeleniumHQ/selenium/blob/trunk/py/CHANGES)
1086-
* [JavaScript](https://github.com/SeleniumHQ/selenium/blob/trunk/javascript/node/selenium-webdriver/CHANGES.md)
1087-
* [Java](https://github.com/SeleniumHQ/selenium/blob/trunk/java/CHANGELOG)
1088-
* [DotNet](https://github.com/SeleniumHQ/selenium/blob/trunk/dotnet/CHANGELOG)
1089-
* [IEDriverServer](https://github.com/SeleniumHQ/selenium/blob/trunk/cpp/iedriverserver/CHANGELOG)
1090+
For each component's detailed changelog, please check:
1091+
* [Ruby](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES)
1092+
* [Python](https://github.com/SeleniumHQ/selenium/blob/trunk/py/CHANGES)
1093+
* [JavaScript](https://github.com/SeleniumHQ/selenium/blob/trunk/javascript/node/selenium-webdriver/CHANGES.md)
1094+
* [Java](https://github.com/SeleniumHQ/selenium/blob/trunk/java/CHANGELOG)
1095+
* [DotNet](https://github.com/SeleniumHQ/selenium/blob/trunk/dotnet/CHANGELOG)
1096+
* [IEDriverServer](https://github.com/SeleniumHQ/selenium/blob/trunk/cpp/iedriverserver/CHANGELOG)
10901097
1091-
### Commits in this release
1092-
<details>
1093-
<summary>Click to see all the commits included in this release</summary>
1098+
### Commits in this release
1099+
<details>
1100+
<summary>Click to see all the commits included in this release</summary>
10941101
1095-
#{git_log_output}
1102+
#{git_log_output}
10961103
1097-
</details>
1104+
</details>
10981105
RELEASE_NOTES
10991106

11001107
FileUtils.mkdir_p('build/dist')

0 commit comments

Comments
 (0)
Please sign in to comment.