Merge remote-tracking branch 'upstream/trunk' into dotnet-logging-issue

Author: nvborisenko

.bazelrc

@@ -30,15 +30,19 @@ build --tool_java_runtime_version=remotejdk_17
 build --javacopt="--release 11"
 
 # Require java dependencies to be used and first-order
-
 build --experimental_strict_java_deps=strict
 build --explicit_java_test_deps
 
+# Avoid ErrorProne getting annoyed about "impossible null checks"
+build --javacopt="-Xep:ImpossibleNullComparison:OFF"
+
 # Allow spaces in runfile paths
 build --nobuild_runfile_links
 
 # More JS magic
 build --experimental_allow_unresolved_symlinks
+# Avoid a warning about directory tracking being unsound
+startup --host_jvm_args=-DBAZEL_TRACK_SOURCE_DIRECTORIES=1
 
 # Required for faster TS builds
 build --@aspect_rules_ts//ts:skipLibCheck=always
@@ -53,6 +57,11 @@ query --@aspect_rules_ts//ts:default_to_tsc_transpiler
 
 build --incompatible_strict_action_env
 
+# Required to get `protobuf` compiling, which is required for `rules_closure`
+build --incompatible_enable_cc_toolchain_resolution
+build --cxxopt=-std=c++14
+build --host_cxxopt=-std=c++14
+
 # For build stamping
 
 build --enable_platform_specific_config
@@ -90,6 +99,7 @@ test --test_env=JRUBY_OPTS="--dev"
 
 # Expose necessary variables for Selenium-Manager.
 
+test:windows --test_env=PATH
 test:windows --test_env=LOCALAPPDATA
 test:windows --test_env=PROGRAMFILES="C:\\Program Files"
 test:windows --test_env=PROGRAMFILES(X86)="C:\\Program Files (x86)"
@@ -99,9 +109,14 @@ test --test_timeout=1800
 test:node_debug --test_output=streamed --test_strategy=exclusive --test_timeout=9999 --nocache_test_results
 test:ruby_debug --test_output=streamed --test_env=RUBY_DEBUG_FORK_MODE=parent --run_under="@bundle//bin:rdbg --nonstop --open --command"
 
-build:release --config=remote
+
 build:release --stamp
-build:release --remote_download_outputs=toplevel
+build:release --compilation_mode=opt
+
+# As regular `release` but all the build work happens on the RBE
+build:remote_release --config=release
+build:remote_release --config=remote
+build:remote_release --remote_download_toplevel
 
 # RBE
 import %workspace%/.bazelrc.remote

.bazelrc.remote

@@ -7,9 +7,6 @@ build:remote --remote_cache=grpcs://gypsum.cluster.engflow.com
 # The number of cores available
 build:remote -j 50
 
-# Build Without The Bytes
-build:remote --remote_download_minimal
-
 build:remote --define=EXECUTOR=remote
 build:remote --experimental_inmemory_dotd_files
 build:remote --experimental_inmemory_jdeps_files
@@ -43,7 +40,7 @@ test:remote --test_env=PATH=/bin:/usr/bin:/usr/local/bin
 test:remote --test_env=HOME=/home/dev
 
 # Make sure we sniff credentials properly
-build:remote --credential_helper=%workspace%/scripts/credential-helper.sh
+build:remote --credential_helper=gypsum.cluster.engflow.com=%workspace%/scripts/credential-helper.sh
 
 # Use pinned browsers when running remotely
 build:remote --//common:pin_browsers
@@ -64,6 +61,7 @@ test:remote --test_timeout=600
 build:remote-ci --config=remote
 build:remote-ci --curses=no --color=yes --show_timestamps --show_progress_rate_limit=5
 build:remote-ci --bes_upload_mode=wait_for_upload_complete
+build:remote-ci --remote_download_minimal
 
 # Configuration changes suggested by EngFlow
 build:remote --grpc_keepalive_time=30s

.bazelversion

@@ -1 +1 @@
-7.1.0
+7.4.1

.github/dependabot.yml

@@ -0,0 +1,6 @@
+changelog:
+  exclude:
+    labels:
+      - dependencies
+    authors:
+      - selenium-ci

.github/release.yml

@@ -70,7 +70,7 @@ on:
 jobs:
   bazel:
     name: ${{ inputs.name }}
-    runs-on: ${{ inputs.os }}-latest
+    runs-on: ${{ format('{0}-latest', inputs.os) }}
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       SEL_M2_USER: ${{ secrets.SEL_M2_USER }}
@@ -82,6 +82,12 @@ jobs:
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v4
+      - name: Pull latest changes from head ref for PRs
+        if: contains(github.head_ref, 'renovate/')
+        run: git pull origin ${{ github.head_ref }}
+      - name: Pull latest changes from ref for branch pushes
+        if: contains(github.ref, 'renovate/')
+        run: git pull origin ${{ github.ref }}
       - name: Free space
         if: inputs.os != 'windows'
         run: ./scripts/github-actions/free-disk-space.sh
@@ -116,7 +122,7 @@ jobs:
           node-version: ${{ inputs.node-version }}
       - name: Setup Bazel with caching
         if: inputs.caching
-        uses: bazel-contrib/setup-bazel@0.8.1
+        uses: bazel-contrib/setup-bazel@0.9.1
         with:
           bazelisk-cache: true
           bazelrc: common --color=yes
@@ -130,7 +136,7 @@ jobs:
           repository-cache: true
       - name: Setup Bazel without caching
         if: inputs.caching == false
-        uses: bazel-contrib/setup-bazel@0.8.1
+        uses: bazel-contrib/setup-bazel@0.9.1
         with:
           bazelrc: common --color=yes
       - name: Setup Fluxbox and Xvfb
@@ -143,25 +149,12 @@ jobs:
       - name: Set resolution
         if: inputs.os == 'windows' && inputs.browser != ''
         run: Set-DisplayResolution -Width 1920 -Height 1080 -Force
-      - name: Setup Chrome
-        if: inputs.browser == 'chrome'
-        uses: browser-actions/setup-chrome@latest
-        with:
-          chrome-version: ${{ inputs.browser-version || 'stable' }}
-      - name: Setup Firefox
-        if: inputs.browser == 'firefox'
-        uses: abhi1693/[email protected]
-        with:
-          browser: firefox
-          version: ${{ inputs.browser-version || 'latest' }}
-      - name: Setup Edge
-        if: inputs.browser == 'edge'
-        uses: browser-actions/setup-edge@latest
-        with:
-          edge-version: ${{ inputs.browser-version || 'stable' }}
       - name: Setup Safari
         if: inputs.browser == 'safari'
         run: sudo safaridriver --enable
+      - name: Setup curl for Ubuntu
+        if: inputs.os == 'ubuntu'
+        run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
       - name: Run Bazel
         run: ${{ inputs.run }}
       - name: Start SSH session

.github/workflows/bazel.yml

@@ -23,4 +23,5 @@ jobs:
       java-version: 17
       os: windows
       run: |
+        fsutil 8dot3name set 0
         bazel test //dotnet/test/common:ElementFindingTest-firefox //dotnet/test/common:ElementFindingTest-chrome --pin_browsers=true

.github/workflows/ci-dotnet.yml

@@ -22,6 +22,7 @@ jobs:
       # https://github.com/bazelbuild/rules_jvm_external/issues/1046
       java-version: 17
       run: |
+        fsutil 8dot3name set 0
         bazel test --flaky_test_attempts 3 //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest `
             //java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest `
             //java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest `

.github/workflows/ci-java.yml

@@ -16,7 +16,7 @@ jobs:
   docs:
     name: Documentation
     needs: build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v4
@@ -36,7 +36,7 @@ jobs:
   lint:
     name: Lint
     needs: build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v4
@@ -58,7 +58,7 @@ jobs:
   mypy:
     name: Mypy
     needs: build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout source tree
         uses: actions/checkout@v4
@@ -81,8 +81,54 @@ jobs:
     name: Remote Tests
     needs: build
     uses: ./.github/workflows/bazel.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - browser: firefox
     with:
-      name: Integration Tests (remote)
-      browser: firefox
-      cache-key: py-remote
+      name: Integration Tests (remote, ${{ matrix.browser }})
+      browser: ${{ matrix.browser }}
+      cache-key: py-remote-${{ matrix.browser }}
       run: bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-remote
+
+  browser-tests:
+    name: Browser Tests
+    needs: build
+    uses: ./.github/workflows/bazel.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - browser: chrome
+            os: ubuntu
+          - browser: edge
+            os: ubuntu
+          - browser: firefox
+            os: ubuntu
+    with:
+      name: Integration Tests (${{ matrix.browser }}, ${{ matrix.os }})
+      browser: ${{ matrix.browser }}
+      os: ${{ matrix.os }}
+      cache-key: py-browser-${{ matrix.browser }}
+      run: |
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:common-${{ matrix.browser }}-bidi
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-${{ matrix.browser }}
+
+  safari-tests:
+    name: Browser Tests
+    needs: build
+    uses: ./.github/workflows/bazel.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - browser: safari
+            os: macos
+    with:
+      name: Integration Tests (${{ matrix.browser }}, ${{ matrix.os }})
+      browser: ${{ matrix.browser }}
+      os: ${{ matrix.os }}
+      cache-key: py-browser-${{ matrix.browser }}
+      run: |
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-${{ matrix.browser }}