Skip to content

Commit 4b40ce2

Browse files
authored
Merge branch 'trunk' into js_ws_port
2 parents e504ad0 + 2f25394 commit 4b40ce2

24 files changed

+652
-440
lines changed

.github/label-commenter-config.yml

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Configuration for Label Commenter - https://github.com/peaceiris/actions-label-commenter
22
labels:
3-
- name: needs-triaging
3+
- name: A-needs-triaging
44
labeled:
55
issue:
66
body: |
@@ -15,7 +15,7 @@ labels:
1515
Triage this issue by using labels.
1616
</p>
1717
<p>
18-
If information is missing, add a helpful comment and then <code>I-issue-template</code> label.
18+
If information is missing, add a helpful comment and then <code>J-issue-template</code> label.
1919
</p>
2020
<p>
2121
If the issue is a question, add the <code>I-question</code> label.
@@ -101,18 +101,18 @@ labels:
101101
102102
Feel free to comment the issues that you raise back in this issue. Thank you.
103103
action: close
104-
- name: I-issue-template
104+
- name: J-issue-template
105105
labeled:
106106
issue:
107107
body: |
108108
Hi, @{{ issue.user.login }}.
109-
Please follow the issue template, we need more information to reproduce the issue.
109+
Please follow the issue template; we need more information to reproduce the issue.
110110
111111
Either a complete code snippet and URL/HTML (if more than one file is needed, provide a GitHub repo and instructions to run the code), the specific versions used, or a more detailed description to help us understand the issue.
112112
113113
Note: If you cannot share your code and URL/HTML, any complete code snippet and URL/HTML that reproduces the issue is good enough.
114114
115-
Reply to this issue when all information is provided, thank you.
115+
Reply to this issue when all information is provided. Thank you.
116116
- name: I-question
117117
labeled:
118118
issue:
@@ -137,3 +137,29 @@ labels:
137137
138138
Please turn on logging and re-run your code. Information on how to adjust logs for your language can be found in our
139139
[Troubleshooting documentation](https://www.selenium.dev/documentation/webdriver/troubleshooting/logging/).
140+
- name: B-support
141+
labeled:
142+
issue:
143+
body: |
144+
Hi, @{{ issue.user.login }}.
145+
146+
This is related to code in the Support packages. The support packages contain example code that
147+
many users find helpful, but they do not necessarily represent the best practices for using Selenium,
148+
and the Selenium team is not prioritizing work on them right now.
149+
This doesn't mean that we won't ever work on them, but it is not on our roadmap as we push to release Selenium 5.
150+
151+
We actively encourage people to create their own wrapper and helper code that makes sense for them.
152+
If you have any questions, please [contact us](https://www.selenium.dev/support)
153+
pr:
154+
body: |
155+
Thank you, @{{ pull_request.user.login }} for this code suggestion.
156+
157+
The support packages contain example code that many users find helpful, but they do not necessarily represent
158+
the best practices for using Selenium, and the Selenium team is not currently merging changes to them.
159+
160+
We actively encourage people to add the wrapper and helper code that makes sense for them to their own frameworks.
161+
If you have any questions, please [contact us](https://www.selenium.dev/support)
162+
action: close
163+
164+
165+

.github/pr-labeler-config.yml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
C-java:
2+
- changed-files:
3+
- any-glob-to-any-file:
4+
- 'java/**'
5+
6+
C-py:
7+
- changed-files:
8+
- any-glob-to-any-file:
9+
- 'py/**'
10+
11+
C-dotnet:
12+
- changed-files:
13+
- any-glob-to-any-file:
14+
- 'dotnet/**'
15+
16+
C-rb:
17+
- changed-files:
18+
- any-glob-to-any-file:
19+
- 'rb/**'
20+
21+
C-nodejs:
22+
- changed-files:
23+
- any-glob-to-any-file:
24+
- 'javascript/selenium-webdriver/**'
25+
26+
C-cpp:
27+
- changed-files:
28+
- any-glob-to-any-file:
29+
- 'cpp/**'
30+
31+
C-rust:
32+
- changed-files:
33+
- any-glob-to-any-file:
34+
- 'rust/**'
35+
36+
B-atoms:
37+
- changed-files:
38+
- any-glob-to-any-file:
39+
- 'javascript/atoms/**'
40+
41+
B-grid:
42+
- changed-files:
43+
- any-glob-to-any-file:
44+
- 'java/src/org/openqa/selenium/grid/**'
45+
- 'javascript/grid-ui/**'
46+
47+
B-manager:
48+
- changed-files:
49+
- any-glob-to-any-file:
50+
- 'rust/**'
51+
52+
B-devtools:
53+
- changed-files:
54+
- any-glob-to-any-file:
55+
- 'common/devtools/**'
56+
- '**/devtools/**'
57+
- '**/bidi/**'
58+
59+
B-build:
60+
- changed-files:
61+
- any-glob-to-any-file:
62+
- '.github/**'
63+
- 'scripts/**'
64+
- 'rake_tasks/**'
65+
- 'Rakefile'
66+
- 'BUILD.bazel'
67+
- '**/*.bazel'
68+
- '**/*.bzl'
69+
- '.bazel*'
70+
71+
B-support:
72+
- changed-files:
73+
- any-glob-to-any-file:
74+
- '**/support/**'

.github/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
changelog:
22
exclude:
33
labels:
4-
- dependencies
4+
- B-dependencies
55
authors:
66
- selenium-ci

.github/renovate.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"labels": ["B-dependencies"]
3+
}

.github/workflows/label-commenter.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ name: Label Commenter
44
on:
55
issues:
66
types: [ labeled ]
7+
pull_request_target:
8+
types: [labeled]
79

810
permissions:
911
contents: read

.github/workflows/pr-labeler.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Label pull requests based on file paths
2+
3+
on:
4+
pull_request:
5+
types: [opened]
6+
7+
permissions:
8+
contents: read
9+
pull-requests: write
10+
11+
jobs:
12+
label:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout repository
16+
uses: actions/checkout@v4
17+
- uses: actions/labeler@v5
18+
with:
19+
repo-token: ${{ secrets.GITHUB_TOKEN }}
20+
configuration-path: .github/pr-labeler-config.yml

.github/workflows/stale.yml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,29 @@ jobs:
2020
with:
2121
stale-issue-message: 'This issue is stale because it has been open 280 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
2222
close-issue-message: 'This issue was closed because it has been stalled for 14 days with no activity.'
23-
stale-issue-label: 'I-stale'
23+
stale-issue-label: 'J-stale'
24+
stale-pr-label: 'J-stale'
2425
days-before-stale: 180
2526
days-before-close: 14
2627
exempt-all-milestones: true
2728
- uses: actions/stale@v9
2829
with:
2930
close-issue-message: 'This issue was closed because we did not receive any additional information after 14 days.'
30-
stale-issue-label: 'R-awaiting answer'
31+
stale-issue-label: 'J-awaiting answer'
3132
days-before-stale: -1
3233
days-before-close: 14
33-
labels-to-add-when-unstale: 'needs-triaging'
34-
34+
labels-to-add-when-unstale: 'A-needs-triaging'
35+
- uses: actions/stale@v9
36+
with:
37+
close-issue-message: 'This issue was closed because we did not receive any additional information after 14 days.'
38+
stale-issue-label: 'J-logging'
39+
days-before-stale: -1
40+
days-before-close: 14
41+
labels-to-add-when-unstale: 'A-needs-triaging'
42+
- uses: actions/stale@v9
43+
with:
44+
close-issue-message: 'This issue was closed because we did not receive any additional information after 14 days.'
45+
stale-issue-label: 'J-issue-template'
46+
days-before-stale: -1
47+
days-before-close: 14
48+
labels-to-add-when-unstale: 'A-needs-triaging'

.github/workflows/update-documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,5 +107,5 @@ jobs:
107107
- Auto-generated by [create-pull-request][1]
108108
109109
[1]: https://github.com/peter-evans/create-pull-request
110-
labels: documentation
110+
labels: B-docs
111111
draft: false

.pr-agent.toml

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# Used by qodo-merge-pro bot
2+
3+
[config]
4+
enable_labeler = true
5+
enable_custom_labels=true
6+
labels_mode = "custom_only"
7+
8+
[custom_labels."B-atoms"]
9+
description = "Related to one or more of the JavaScript atoms Selenium compiles and uses"
10+
11+
[custom_labels."B-build"]
12+
description = "Related to any build script execution, bazel implementation or CI integrations"
13+
14+
[custom_labels."B-devtools"]
15+
description = "Related to anything BiDi or Chrome DevTools"
16+
17+
[custom_labels."B-docs"]
18+
description = "Related to API documentation such as Javadoc or code-level docs. Not for website updates, examples, or general comments."
19+
20+
[custom_labels."B-grid"]
21+
description = "Everything grid, server related, possibly including remote webdriver execution"
22+
23+
[custom_labels."B-manager"]
24+
description = "Focused on something related to Selenium Manager and Driver Finding, whether in Rust or in the bindings"
25+
26+
[custom_labels."D-chrome"]
27+
description = "Specific to Chrome"
28+
29+
[custom_labels."D-firefox"]
30+
description = "Specific to Firefox"
31+
32+
[custom_labels."D-safari"]
33+
description = "Specific to Safari"
34+
35+
[custom_labels."D-IE"]
36+
description = "Specific to Internet Explorer"
37+
38+
[custom_labels."D-edge"]
39+
description = "Specific to Microsoft Edge"
40+
41+
[custom_labels."E-easy"]
42+
description = "An easy PR to review"
43+
44+
[custom_labels."E-less easy"]
45+
description = "A somewhat difficult PR to review"
46+
47+
[custom_labels."E-hard"]
48+
description = "A hard or complex PR to review"
49+
50+
[custom_labels."I-cleanup"]
51+
description = "Internal tidy-up only, not user-facing. Applies to typo fixes, syntax tweaks, comment formatting, or dead code removal. Should not be used for bug fixes or behavior changes."
52+
53+
[custom_labels."I-regression"]
54+
description = "Fixes something that used to work and no longer does"
55+
56+
[custom_labels."I-performance"]
57+
description = "Improves performance"
58+
59+
[custom_labels."I-security"]
60+
description = "Addresses a security vulnerability"
61+
62+
[custom_labels."OS-linux"]
63+
description = "Specific to Linux"
64+
65+
[custom_labels."OS-mac"]
66+
description = "Specific to macOS"
67+
68+
[custom_labels."OS-windows"]
69+
description = "Specific to Windows"
70+
71+
[custom_labels."P-bug fix"]
72+
description = "Addresses a known issue in a backwards compatible way"
73+
74+
[custom_labels."P-enhancement"]
75+
description = "Creates a new feature in a backwards compatible way"
76+
77+
[custom_labels."P-breaking change"]
78+
description = "Introduces a non-backwards compatible change (a fix or feature that would cause existing functionality to change)"

Rakefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -544,10 +544,6 @@ namespace :node do
544544
File.open(file, 'w') { |f| f.puts text }
545545
@git.add(file)
546546
end
547-
548-
# Update package-lock.json
549-
sh 'pnpm install --dir javascript/selenium-webdriver', verbose: true
550-
@git.add('javascript/selenium-webdriver/package-lock.json')
551547
end
552548
end
553549

0 commit comments

Comments
 (0)