Skip to content

Commit 6d93237

Browse files
committed
[build] improve how nightly version is referenced in rake tasks
1 parent 7ce4ef4 commit 6d93237

File tree

1 file changed

+21
-19
lines changed

1 file changed

+21
-19
lines changed

Rakefile

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -494,8 +494,8 @@ namespace :node do
494494
end
495495

496496
desc 'Release Node npm package'
497-
task :release, [:nightly] do |_task, arguments|
498-
nightly = arguments[:nightly]
497+
task :release do |_task, arguments|
498+
nightly = arguments.to_a.include?('nightly')
499499
if nightly
500500
puts 'Updating Node version to nightly...'
501501
Rake::Task['node:version'].invoke('nightly') if nightly
@@ -565,8 +565,8 @@ namespace :py do
565565
end
566566

567567
desc 'Release Python wheel and sdist to pypi'
568-
task :release, [:nightly] do |_task, arguments|
569-
nightly = arguments[:nightly]
568+
task :release do |_task, arguments|
569+
nightly = arguments.to_a.include?('nightly')
570570
if nightly
571571
puts 'Updating Python version to nightly...'
572572
Rake::Task['py:version'].invoke('nightly')
@@ -741,8 +741,8 @@ namespace :rb do
741741
end
742742

743743
desc 'Push Ruby gems to rubygems'
744-
task :release, [:nightly] do |_task, arguments|
745-
nightly = arguments[:nightly]
744+
task :release do |_task, arguments|
745+
nightly = arguments.to_a.include?('nightly')
746746

747747
if nightly
748748
puts 'Bumping Ruby nightly version...'
@@ -751,9 +751,11 @@ namespace :rb do
751751
puts 'Releasing nightly WebDriver gem...'
752752
Bazel.execute('run', ['--config=release'], '//rb:selenium-webdriver-release-nightly')
753753
else
754+
patch_release = ruby_version.split('.').fetch(2, '0').to_i > 0
755+
754756
puts 'Releasing Ruby gems...'
755757
Bazel.execute('run', ['--config=release'], '//rb:selenium-webdriver-release')
756-
Bazel.execute('run', ['--config=release'], '//rb:selenium-devtools-release')
758+
Bazel.execute('run', ['--config=release'], '//rb:selenium-devtools-release') unless patch_release
757759
end
758760
end
759761

@@ -823,8 +825,8 @@ namespace :dotnet do
823825
end
824826

825827
desc 'Upload nupkg files to Nuget'
826-
task :release, [:nightly] do |_task, arguments|
827-
nightly = arguments[:nightly]
828+
task :release do |_task, arguments|
829+
nightly = arguments.to_a.include?('nightly')
828830
if nightly
829831
puts 'Updating .NET version to nightly...'
830832
Rake::Task['dotnet:version'].invoke('nightly')
@@ -941,8 +943,8 @@ namespace :java do
941943
end
942944

943945
desc 'Deploy all jars to Maven'
944-
task :release, [:nightly] do |_task, arguments|
945-
nightly = arguments[:nightly]
946+
task :release do |_task, arguments|
947+
nightly = arguments.to_a.include?('nightly')
946948

947949
ENV['MAVEN_USER'] ||= ENV.fetch('SEL_M2_USER', nil)
948950
ENV['MAVEN_PASSWORD'] ||= ENV.fetch('SEL_M2_PASS', nil)
@@ -1142,17 +1144,17 @@ namespace :all do
11421144
end
11431145

11441146
desc 'Release all artifacts for all language bindings'
1145-
task :release, [:nightly] do |_task, arguments|
1147+
task :release do |_task, arguments|
11461148
Rake::Task['clean'].invoke
11471149

1148-
nightly = arguments[:nightly]
1149-
Rake::Task['java:release'].invoke(nightly)
1150-
Rake::Task['py:release'].invoke(nightly)
1151-
Rake::Task['rb:release'].invoke(nightly)
1152-
Rake::Task['dotnet:release'].invoke(nightly)
1153-
Rake::Task['node:release'].invoke(nightly)
1150+
args = arguments.to_a.include?('nightly') ? ['nightly'] : []
1151+
Rake::Task['java:release'].invoke(*args)
1152+
Rake::Task['py:release'].invoke(*args)
1153+
Rake::Task['rb:release'].invoke(*args)
1154+
Rake::Task['dotnet:release'].invoke(*args)
1155+
Rake::Task['node:release'].invoke(*args)
11541156

1155-
unless nightly
1157+
unless args.include?('nightly')
11561158
puts 'bump all versions to nightly'
11571159
Rake::Task['all:version'].invoke('nightly')
11581160
end

0 commit comments

Comments
 (0)