Skip to content

Commit 027231c

Browse files
authored
Merge branch 'trunk' into js_connect_exist
2 parents c419b4c + 4d413c6 commit 027231c

File tree

108 files changed

+1948
-1351
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+1948
-1351
lines changed

.bazelrc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ build:release --stamp
119119
build:release --compilation_mode=opt
120120

121121
# As regular `release` but all the build work happens on the RBE
122-
build:remote_release --config=release
123-
build:remote_release --config=remote
124-
build:remote_release --remote_download_toplevel
122+
build:rbe_release --config=release
123+
build:rbe_release --config=rbe
124+
build:rbe_release --remote_download_toplevel
125125

126126
# RBE
127127
import %workspace%/.bazelrc.remote

.bazelrc.remote

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
11
# The RBE to use
2-
build:remote --bes_results_url=https://gypsum.cluster.engflow.com/invocation
3-
build:remote --bes_backend=grpcs://gypsum.cluster.engflow.com
4-
build:remote --remote_executor=grpcs://gypsum.cluster.engflow.com
5-
build:remote --remote_cache=grpcs://gypsum.cluster.engflow.com
2+
build:rbe --bes_results_url=https://gypsum.cluster.engflow.com/invocation
3+
build:rbe --bes_backend=grpcs://gypsum.cluster.engflow.com
4+
build:rbe --remote_executor=grpcs://gypsum.cluster.engflow.com
5+
build:rbe --remote_cache=grpcs://gypsum.cluster.engflow.com
66

77
# The number of cores available
8-
build:remote -j 50
8+
build:rbe -j 50
99

10-
build:remote --define=EXECUTOR=remote
11-
build:remote --experimental_inmemory_dotd_files
12-
build:remote --experimental_inmemory_jdeps_files
13-
build:remote --remote_timeout=3600
14-
build:remote --spawn_strategy=remote,local
15-
#build:remote --nolegacy_important_outputs
16-
build:remote --incompatible_strict_action_env=true
10+
build:rbe --define=EXECUTOR=remote
11+
build:rbe --experimental_inmemory_dotd_files
12+
build:rbe --experimental_inmemory_jdeps_files
13+
build:rbe --remote_timeout=3600
14+
build:rbe --spawn_strategy=remote,local
15+
#build:rbe --nolegacy_important_outputs
16+
build:rbe --incompatible_strict_action_env=true
1717

18-
build:remote --crosstool_top=//common/remote-build/cc:toolchain
19-
build:remote --extra_execution_platforms=//common/remote-build:platform
20-
build:remote --extra_toolchains=//common/remote-build:cc-toolchain
21-
build:remote --host_platform=//common/remote-build:platform
22-
build:remote --platforms=//common/remote-build:platform
23-
build:remote --cxxopt=-std=c++14
18+
build:rbe --crosstool_top=//common/remote-build/cc:toolchain
19+
build:rbe --extra_execution_platforms=//common/remote-build:platform
20+
build:rbe --extra_toolchains=//common/remote-build:cc-toolchain
21+
build:rbe --host_platform=//common/remote-build:platform
22+
build:rbe --platforms=//common/remote-build:platform
23+
build:rbe --cxxopt=-std=c++14
2424

2525
# The Docker images are running Linux
26-
build:remote --cpu=k8
27-
build:remote --host_cpu=k8
26+
build:rbe --cpu=k8
27+
build:rbe --host_cpu=k8
2828

29-
build:remote --disk_cache=
29+
build:rbe --disk_cache=
3030

31-
build:remote --incompatible_enable_cc_toolchain_resolution
32-
build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
33-
test:remote --test_env=DISPLAY=:99.0
34-
test:remote --test_tag_filters=-exclusive-if-local,-skip-remote,-remote
31+
build:rbe --incompatible_enable_cc_toolchain_resolution
32+
build:rbe --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
33+
test:rbe --test_env=DISPLAY=:99.0
34+
test:rbe --test_tag_filters=-exclusive-if-local,-skip-rbe,-remote
3535

3636
# Env vars we can hard code
37-
build:remote --action_env=HOME=/home/dev
38-
build:remote --action_env=PATH=/bin:/usr/bin:/usr/local/bin
39-
test:remote --test_env=PATH=/bin:/usr/bin:/usr/local/bin
40-
test:remote --test_env=HOME=/home/dev
37+
build:rbe --action_env=HOME=/home/dev
38+
build:rbe --action_env=PATH=/bin:/usr/bin:/usr/local/bin
39+
test:rbe --test_env=PATH=/bin:/usr/bin:/usr/local/bin
40+
test:rbe --test_env=HOME=/home/dev
4141

4242
# Make sure we sniff credentials properly
43-
build:remote --credential_helper=gypsum.cluster.engflow.com=%workspace%/scripts/credential-helper.sh
43+
build:rbe --credential_helper=gypsum.cluster.engflow.com=%workspace%/scripts/credential-helper.sh
4444

4545
# Use pinned browsers when running remotely
46-
build:remote --//common:pin_browsers
46+
build:rbe --//common:pin_browsers
4747

4848
# The remote build machines are pretty small, and 50 threads may leave them
4949
# thrashing, but our dev machines are a lot larger. Scale the workload so we
5050
# make reasonable usage of everything, everywhere, all at once.
51-
build:remote --local_resources=cpu='HOST_CPUS*10'
52-
build:remote --local_resources=memory='HOST_RAM*4.0'
51+
build:rbe --local_resources=cpu='HOST_CPUS*10'
52+
build:rbe --local_resources=memory='HOST_RAM*4.0'
5353

5454
# A small hint that we're running our tests remotely
55-
test:remote --test_env=REMOTE_BUILD=1
55+
test:rbe --test_env=REMOTE_BUILD=1
5656

5757
# Wait for up to 5 minutes for a test to pass
58-
test:remote --test_timeout=600
58+
test:rbe --test_timeout=600
5959

6060
# Extend the remote config for CI
61-
build:remote-ci --config=remote
62-
build:remote-ci --curses=no --color=yes --show_timestamps --show_progress_rate_limit=5
63-
build:remote-ci --bes_upload_mode=wait_for_upload_complete
64-
build:remote-ci --remote_download_minimal
61+
build:rbe-ci --config=rbe
62+
build:rbe-ci --curses=no --color=yes --show_timestamps --show_progress_rate_limit=5
63+
build:rbe-ci --bes_upload_mode=wait_for_upload_complete
64+
build:rbe-ci --remote_download_minimal
6565

6666
# Configuration changes suggested by EngFlow
67-
build:remote --grpc_keepalive_time=30s
68-
build:remote --nolegacy_important_outputs
67+
build:rbe --grpc_keepalive_time=30s
68+
build:rbe --nolegacy_important_outputs

.github/workflows/pre-release.yml

Lines changed: 37 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,38 @@ jobs:
7878
run: |
7979
git config --local user.email "[email protected]"
8080
git config --local user.name "Selenium CI Bot"
81-
- name: Update everything including early release CDP
82-
if: ${{ github.event.inputs.chrome_channel == 'early-stable' }}
83-
run: ./go all:prepare[${{ github.event.inputs.version }},Beta]
84-
- name: Update everything including released CDP
85-
if: ${{ github.event.inputs.chrome_channel == 'stable' }}
86-
run: ./go "all:prepare[${{ github.event.inputs.version }},Stable]"
81+
- name: Update browser versions
82+
run: ./go update_browsers[${{ github.event.inputs.chrome_channel }}]
83+
- name: Commit browser updates
84+
run: git commit -m "update pinned browser versions"
85+
- name: Update devtools versions
86+
run: ./go all:update_cdp[${{ github.event.inputs.chrome_channel }}]
87+
- name: Commit DevTools updates
88+
run: git commit -m "update devtools versions"
89+
- name: Update Selenium Manager versions
90+
run: ./go update_manager
91+
- name: Commit Selenium Manager updates
92+
run: git commit -m "update selenium manager versions"
93+
- name: Update Maven dependency versions
94+
run: ./go java:update
95+
- name: Commit Maven version updates
96+
run: git commit -m "update maven dependency versions"
97+
- name: Update Authors file
98+
run: ./go authors
99+
- name: Commit Authors updates
100+
run: git commit -m "update authors file"
101+
- name: Bump minor version
102+
run: ./go all:version
103+
- name: Commit version updates
104+
run: git commit -m "bump versions in preparation for release"
105+
- name: Update changelog
106+
run: ./go all:changelog
107+
- name: Commit changelog updates
108+
run: git commit -m "WIP - rough auto-update of changelog, please edit"
109+
- name: List untracked files
110+
run: git status -u
111+
- name: Clean working directory before PR
112+
run: git clean -fd
87113
- name: Create Pull Request
88114
uses: peter-evans/create-pull-request@v6
89115
with:
@@ -97,17 +123,19 @@ jobs:
97123
**Warning: Manually update the changelogs before merging**
98124
99125
This PR:
100-
* Updates Rust version for Selenium Manager release
101126
* Updates Pinned browser version to coincide with new CDP release
102127
* Adds support for new CDP version and removes old CDP version
103128
* Selenium Manager references the new Selenium Manager release
104129
* Updates Maven Dependencies
105130
* Adds new authors to authors file
106131
* Updates all versions for all bindings
107132
* Generates *rough* change logs for each bindings (please tidy them up before merging this)
133+
* Not all commits need to be in the change log — users do not need to see anything about building or testing Selenium
134+
* Remove references to updating versions including nightly
135+
* The code now outputs the complete body of the commit message; make sure the changelog message is complete and correct
108136
109-
- Auto-generated by [create-pull-request][1]
137+
- This PR was auto-generated by workflow run: [release-preparation][1]
110138
111-
[1]: https://github.com/peter-evans/create-pull-request
139+
[1]: https://github.com/SeleniumHQ/selenium/actions/runs/${{ github.run_id }}
112140
labels: C-build
113141
draft: true

0 commit comments

Comments
 (0)