Skip to content

Commit 6b47c13

Browse files
committed
dynamically get java version from version.bzl for Rakefile
1 parent 053c73b commit 6b47c13

File tree

1 file changed

+14
-16
lines changed

1 file changed

+14
-16
lines changed

Rakefile

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,10 @@ $DEBUG = true if ENV['debug'] == 'true'
5050

5151
verbose($DEBUG)
5252

53-
def release_version
54-
'4.16'
55-
end
56-
57-
def version
58-
"#{release_version}.0-SNAPSHOT"
53+
def java_version
54+
File.foreach('java/version.bzl') do |line|
55+
return line.split('=').last.strip.tr('"', '') if line.include?('SE_VERSION')
56+
end
5957
end
6058

6159
# The build system used by webdriver is layered on top of rake, and we call it
@@ -332,21 +330,21 @@ task 'prep-release-zip': [
332330
'//java/src/org/openqa/selenium/grid:executable-grid',
333331
] do
334332
[
335-
"build/dist/selenium-server-#{version}.zip",
336-
"build/dist/selenium-java-#{version}.zip",
337-
"build/dist/selenium-server-#{version}.jar"
333+
"build/dist/selenium-server-#{java-version}.zip",
334+
"build/dist/selenium-java-#{java-version}.zip",
335+
"build/dist/selenium-server-#{java-version}.jar"
338336
].each do |f|
339337
rm_f(f) if File.exists?(f)
340338
end
341339

342340
mkdir_p 'build/dist'
343341
File.delete
344-
cp "bazel-bin/java/src/org/openqa/selenium/grid/server-zip.zip", "build/dist/selenium-server-#{version}.zip", preserve: false
345-
chmod 0666, "build/dist/selenium-server-#{version}.zip"
346-
cp "bazel-bin/java/src/org/openqa/selenium/client-zip.zip", "build/dist/selenium-java-#{version}.zip", preserve: false
347-
chmod 0666, "build/dist/selenium-java-#{version}.zip"
348-
cp "bazel-bin/java/src/org/openqa/selenium/grid/selenium", "build/dist/selenium-server-#{version}.jar", preserve: false
349-
chmod 0666, "build/dist/selenium-server-#{version}.jar"
342+
cp "bazel-bin/java/src/org/openqa/selenium/grid/server-zip.zip", "build/dist/selenium-server-#{java-version}.zip", preserve: false
343+
chmod 0666, "build/dist/selenium-server-#{java-version}.zip"
344+
cp "bazel-bin/java/src/org/openqa/selenium/client-zip.zip", "build/dist/selenium-java-#{java-version}.zip", preserve: false
345+
chmod 0666, "build/dist/selenium-java-#{java-version}.zip"
346+
cp "bazel-bin/java/src/org/openqa/selenium/grid/selenium", "build/dist/selenium-server-#{java-version}.jar", preserve: false
347+
chmod 0777, "build/dist/selenium-server-#{java-version}.jar"
350348
end
351349

352350
task 'release-java': %i[prep-release-zip publish-maven]
@@ -387,7 +385,7 @@ end
387385

388386
task 'publish-maven-snapshot': JAVA_RELEASE_TARGETS do
389387
creds = read_m2_user_pass
390-
if version.end_with?('-SNAPSHOT')
388+
if java-version.end_with?('-SNAPSHOT')
391389
JAVA_RELEASE_TARGETS.each do |p|
392390
Bazel::execute('run', ['--stamp', '--define', 'maven_repo=https://oss.sonatype.org/content/repositories/snapshots', '--define', "maven_user=#{creds[0]}", '--define', "maven_password=#{creds[1]}", '--define', 'gpg_sign=false'], p)
393391
end

0 commit comments

Comments
 (0)