Skip to content

Commit 70bbec8

Browse files
committed
[build] update rake release tasks to always use bazel stamp
1 parent 3758c19 commit 70bbec8

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

.github/workflows/nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
cache-key: rb-nightly-${{ matrix.gem }}
3838
run: |
3939
export GEM_HOST_API_KEY="Bearer $GITHUB_TOKEN"
40-
./go rb:release[--stamp,nightly]
40+
./go rb:release[nightly]
4141
on-ruby-failure:
4242
name: On Ruby Failure
4343
runs-on: ubuntu-latest
@@ -90,7 +90,7 @@ jobs:
9090
with:
9191
name: Nightly Java Release
9292
cache-key: java-nightly
93-
run: ./go java:release[--stamp,nightly]
93+
run: ./go java:release[nightly]
9494
secrets: inherit
9595
on-java-failure:
9696
name: On Java Failure

Rakefile

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -485,11 +485,11 @@ namespace :node do
485485

486486
desc 'Release Node npm package'
487487
task :release do |_task, arguments|
488-
args = arguments.to_a.compact.empty? ? ['--stamp'] : arguments.to_a.compact
488+
args = arguments.to_a.compact
489489
nightly = args.delete('nightly')
490490
Rake::Task['node:version'].invoke('nightly') if nightly
491491

492-
Bazel.execute('run', args, '//javascript/node/selenium-webdriver:selenium-webdriver.publish')
492+
Bazel.execute('run', ['--stamp'], '//javascript/node/selenium-webdriver:selenium-webdriver.publish')
493493
end
494494

495495
desc 'Release Node npm package'
@@ -550,12 +550,12 @@ namespace :py do
550550

551551
desc 'Release Python wheel and sdist to pypi'
552552
task :release do |_task, arguments|
553-
args = arguments.to_a.compact.empty? ? ['--stamp'] : arguments.to_a.compact
553+
args = arguments.to_a.compact
554554
nightly = args.delete('nightly')
555555
Rake::Task['py:version'].invoke('nightly') if nightly
556556

557557
command = nightly ? '//py:selenium-release-nightly' : '//py:selenium-release'
558-
Bazel.execute('run', args, command)
558+
Bazel.execute('run', ['--stamp'], command)
559559
end
560560

561561
desc 'generate and copy files required for local development'
@@ -725,10 +725,10 @@ namespace :rb do
725725

726726
if nightly
727727
Bazel.execute('run', [], '//rb:selenium-webdriver-bump-nightly-version')
728-
Bazel.execute('run', args, '//rb:selenium-webdriver-release-nightly')
728+
Bazel.execute('run', ['--stamp'], '//rb:selenium-webdriver-release-nightly')
729729
else
730-
Bazel.execute('run', args, '//rb:selenium-webdriver-release')
731-
Bazel.execute('run', args, '//rb:selenium-devtools-release')
730+
Bazel.execute('run', ['--stamp'], '//rb:selenium-webdriver-release')
731+
Bazel.execute('run', ['--stamp'], '//rb:selenium-devtools-release')
732732
end
733733
end
734734

@@ -798,11 +798,10 @@ namespace :dotnet do
798798

799799
desc 'Upload nupkg files to Nuget'
800800
task :release do |_task, arguments|
801-
args = arguments.to_a.compact.empty? ? ['--stamp'] : arguments.to_a.compact
801+
args = arguments.to_a.compact
802802
nightly = args.delete('nightly')
803803
Rake::Task['dotnet:version'].invoke('nightly') if nightly
804-
805-
Rake::Task['dotnet:package'].invoke(*args)
804+
Rake::Task['dotnet:package'].invoke('--stamp')
806805

807806
release_version = dotnet_version
808807
api_key = ENV.fetch('NUGET_API_KEY', nil)
@@ -881,7 +880,7 @@ namespace :java do
881880
desc 'Build Java Client Jars'
882881
task :build do |_task, arguments|
883882
args = arguments.to_a.compact
884-
Bazel.execute('build', args, '//java/src/org/openqa/selenium:client-combined')
883+
JAVA_RELEASE_TARGETS.each { |target| Bazel.execute('build', args, target) }
885884
end
886885

887886
desc 'Build Grid Jar'
@@ -913,16 +912,15 @@ namespace :java do
913912

914913
desc 'Deploy all jars to Maven'
915914
task :release do |_task, arguments|
916-
args = arguments.to_a.compact.empty? ? ['--stamp'] : arguments.to_a.compact
915+
args = arguments.to_a.compact
917916
nightly = args.delete('nightly')
918917
user, password = read_m2_user_pass
919918
repo = nightly ? 'content/repositories/snapshots' : 'service/local/staging/deploy/maven2'
920919
gpg = nightly ? 'false' : 'true'
921920

922921
Rake::Task['java:version'].invoke if nightly
923-
Rake::Task['java:package'].invoke(*args)
924-
925-
JAVA_RELEASE_TARGETS.each { |target| Bazel.execute('build', [], target) }
922+
Rake::Task['java:package'].invoke('--stamp')
923+
Rake::Task['java:build'].invoke('--stamp')
926924
release_args = ['--stamp',
927925
'--define',
928926
"maven_repo=https://oss.sonatype.org/#{repo}",

0 commit comments

Comments
 (0)