Skip to content

Commit 5187579

Browse files
diemoldiemol
authored
Merge branch 'trunk' into node-removed
2 parents 4350089 + 83b0b0d commit 5187579

34 files changed

Lines changed: 112 additions & 383 deletions

‎.github/workflows/ci-ruby.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ jobs:
3939
fail-fast: false
4040
matrix:
4141
include:
42-
- ruby-version: 2.7.6
42+
- ruby-version: 3.0.6
4343
os: ubuntu
44-
- ruby-version: 2.7.6
44+
- ruby-version: 3.0.6
4545
os: windows
4646
- ruby-version: 3.2.0
4747
os: ubuntu

‎Rakefile‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def release_version
5555
end
5656

5757
def version
58-
"#{release_version}.0"
58+
"#{release_version}.1-SNAPSHOT"
5959
end
6060

6161
# The build system used by webdriver is layered on top of rake, and we call it
@@ -386,6 +386,13 @@ task 'publish-maven': JAVA_RELEASE_TARGETS do
386386
end
387387
end
388388

389+
task 'publish-maven-snapshot': JAVA_RELEASE_TARGETS do
390+
creds = read_user_pass_from_m2_settings
391+
JAVA_RELEASE_TARGETS.each do |p|
392+
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=true'], p)
393+
end
394+
end
395+
389396
task :'maven-install' do
390397
JAVA_RELEASE_TARGETS.each do |p|
391398
Bazel::execute('run', ['--stamp', '--define', "maven_repo=file://#{ENV['HOME']}/.m2/repository", '--define', 'gpg_sign=false'], p)

‎WORKSPACE‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,9 +322,9 @@ pin_browsers()
322322

323323
http_archive(
324324
name = "rules_ruby",
325-
sha256 = "5228950029d57476a4903db35cd8ce6a4526e30fba08a01af9d7a9b8ebaf63ae",
326-
strip_prefix = "rules_ruby-9e6e07ed5d7e02f8bb1c77ce543072d5548bbd86",
327-
url = "https://github.com/p0deje/rules_ruby/archive/9e6e07ed5d7e02f8bb1c77ce543072d5548bbd86.zip",
325+
sha256 = "dddae0f5bf2c2aa95e20923a6f9f746b0457b956e43e8bd6874d09d88795b40d",
326+
strip_prefix = "rules_ruby-be44e324165c617210f9d22e4cdf661c9e330ca2",
327+
url = "https://github.com/p0deje/rules_ruby/archive/be44e324165c617210f9d22e4cdf661c9e330ca2.zip",
328328
)
329329

330330
load("//rb:ruby_version.bzl", "RUBY_VERSION")

‎java/maven_install.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3414,7 +3414,6 @@
34143414
"org.openqa.selenium.remote.locators",
34153415
"org.openqa.selenium.remote.mobile",
34163416
"org.openqa.selenium.remote.service",
3417-
"org.openqa.selenium.remote.session",
34183417
"org.openqa.selenium.remote.tracing",
34193418
"org.openqa.selenium.remote.tracing.empty",
34203419
"org.openqa.selenium.remote.tracing.opentelemetry"

‎java/src/org/openqa/selenium/Platform.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,18 @@ public String toString() {
257257
}
258258
},
259259

260+
VENTURA("ventura", "os x 13.0", "macos 13.0") {
261+
@Override
262+
public Platform family() {
263+
return MAC;
264+
}
265+
266+
@Override
267+
public String toString() {
268+
return "macOS 13.0";
269+
}
270+
},
271+
260272
/**
261273
* Many platforms have UNIX traits, amongst them LINUX, Solaris and BSD.
262274
*/

‎java/src/org/openqa/selenium/grid/node/SessionFactory.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,5 @@ public interface SessionFactory extends
2929
Function<CreateSessionRequest, Either<WebDriverException, ActiveSession>>,
3030
Predicate<Capabilities> {
3131

32+
Capabilities getStereotype();
3233
}

‎java/src/org/openqa/selenium/grid/node/config/DriverServiceSessionFactory.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@ public DriverServiceSessionFactory(
9595
this.sessionCapabilitiesMutator = new SessionCapabilitiesMutator(this.stereotype);
9696
}
9797

98+
@Override
99+
public Capabilities getStereotype() {
100+
return stereotype;
101+
}
102+
98103
@Override
99104
public boolean test(Capabilities capabilities) {
100105
return predicate.test(capabilities);

‎java/src/org/openqa/selenium/grid/node/config/NodeOptions.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,12 @@ private void report(Map.Entry<WebDriverInfo, Collection<SessionFactory>> entry)
651651
StringBuilder caps = new StringBuilder();
652652
try (JsonOutput out = JSON.newOutput(caps)) {
653653
out.setPrettyPrint(false);
654-
out.write(entry.getKey().getCanonicalCapabilities());
654+
Optional<SessionFactory> optionalSessionFactory = entry.getValue().stream().findFirst();
655+
if (optionalSessionFactory.isPresent()) {
656+
out.write(optionalSessionFactory.get().getStereotype());
657+
} else {
658+
out.write(entry.getKey().getCanonicalCapabilities());
659+
}
655660
}
656661

657662
LOG.info(String.format(

‎java/src/org/openqa/selenium/grid/node/docker/DockerSessionFactory.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,11 @@ public DockerSessionFactory(
134134
this.slotMatcher = new DefaultSlotMatcher();
135135
}
136136

137+
@Override
138+
public Capabilities getStereotype() {
139+
return stereotype;
140+
}
141+
137142
@Override
138143
public boolean test(Capabilities capabilities) {
139144
return slotMatcher.matches(stereotype, capabilities);

‎java/src/org/openqa/selenium/grid/node/relay/RelaySessionFactory.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,11 @@ public RelaySessionFactory(
9797
.copyOf(Require.nonNull("Stereotype", stereotype));
9898
}
9999

100+
@Override
101+
public Capabilities getStereotype() {
102+
return stereotype;
103+
}
104+
100105
@Override
101106
public boolean test(Capabilities capabilities) {
102107
// If a request reaches this point is because the basic match of W3C caps has already been done.

0 commit comments

Comments
 (0)