Merge branch 'trunk' into rb-bidi-network-module

Author: titusfortner

.bazelignore

@@ -1,5 +1,25 @@
 buck-out
+dotnet/test/firefox/bin
+dotnet/test/firefox/obj
+dotnet/test/edge/bin
+dotnet/test/edge/obj
+dotnet/test/common/bin
+dotnet/test/common/obj
+dotnet/test/support/bin
+dotnet/test/support/obj
+dotnet/test/safari/bin
+dotnet/test/safari/obj
+dotnet/test/chrome/bin
+dotnet/test/chrome/obj
+dotnet/test/ie/bin
+dotnet/test/ie/obj
+dotnet/test/remote/bin
+dotnet/test/remote/obj
+dotnet/src/support/bin
+dotnet/src/support/obj
+dotnet/src/webdriver/bin
+dotnet/src/webdriver/obj
+java/build/production
 java/client/build
 java/server/build
 node_modules
-java/build/production

.bazelrc

@@ -11,14 +11,14 @@ build --flag_alias=headless=//common:headless
 
 # Set the default java toolchain
 
-build --java_language_version=11
-build --java_runtime_version=remotejdk_11
-build --tool_java_language_version=11
-build --tool_java_runtime_version=remotejdk_11
+build --java_language_version=17
+build --java_runtime_version=remotejdk_17
+build --tool_java_language_version=17
+build --tool_java_runtime_version=remotejdk_17
 
-# We target java 8 by default
+# We target java 11 by default
 
-build --javacopt="--release 8"
+build --javacopt="--release 11"
 
 # Require java dependencies to be used and first-order
 
@@ -114,16 +114,14 @@ build:remote --incompatible_enable_cc_toolchain_resolution
 build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
 test:remote --test_env=DISPLAY=:99.0
 test:remote --test_tag_filters=-edge,-safari,-remote
-# Skip tests that we mark specifically as being unable to run on the rbe
-test:remote --test_tag_filters=-no-rbe
 
 # Env vars we can hard code
 build:remote --action_env=HOME=/home/dev
 build:remote --action_env=PATH=/bin:/usr/bin:/usr/local/bin
 test:remote --test_env=HOME=/home/dev
 
 # Make sure we sniff credentials properly
-build:remote --experimental_credential_helper=%workspace%/scripts/credential-helper.sh
+build:remote --credential_helper=%workspace%/scripts/credential-helper.sh
 
 # Use pinned browsers when running remotely
 build:remote --//common:pin_browsers
@@ -144,3 +142,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
+
+# Configuration changes suggested by EngFlow
+build:remote --grpc_keepalive_time=30s
+build:remote --nolegacy_important_outputs

.bazelversion

@@ -1 +1 @@
-6.1.2
+6.3.2

.github/dependabot.yml

@@ -5,4 +5,52 @@ updates:
     schedule:
       interval: daily
       time: '08:00'
-    open-pull-requests-limit: 99
+    open-pull-requests-limit: 5
+    labels:
+      - "C-build"
+      - "dependencies"
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: daily
+      time: '08:00'
+    open-pull-requests-limit: 10
+    labels:
+      - "C-nodejs"
+      - "dependencies"
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: daily
+      time: '08:00'
+    open-pull-requests-limit: 10
+    labels:
+      - "C-rb"
+      - "dependencies"
+  - package-ecosystem: "cargo"
+    directory: "/rust"
+    schedule:
+      interval: daily
+      time: '08:00'
+    open-pull-requests-limit: 10
+    labels:
+      - "C-rust"
+      - "dependencies"
+  - package-ecosystem: "pip"
+    directory: "/py"
+    schedule:
+      interval: daily
+      time: '08:00'
+    open-pull-requests-limit: 10
+    labels:
+      - "C-py"
+      - "dependencies"
+  - package-ecosystem: "nuget"
+    directory: "/dotnet"
+    schedule:
+      interval: daily
+      time: '08:00'
+    open-pull-requests-limit: 0
+    labels:
+      - "C-dotnet"
+      - "dependencies"

.github/workflows/bazel.yml

@@ -42,23 +42,22 @@ on:
         type: string
         default: ''
       nightly-release-files:
-        description: Files to upload to the Nightly release tah
+        description: Files to upload to the Nightly release tag
         required: false
         type: string
         default: ''
 
 jobs:
   bazel:
     name: ${{ inputs.name }}
-    # Use windows-latest once https://github.com/actions/runner-images/issues/7662 is fixed.
-    runs-on: ${{ inputs.os == 'windows' && 'windows-2019' || format('{0}-latest', inputs.os) }}
+    runs-on: ${{ inputs.os }}-latest
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       SEL_M2_USER: ${{ secrets.SEL_M2_USER }}
       SEL_M2_PASS: ${{ secrets.SEL_M2_PASS }}
     steps:
       - name: Checkout source tree
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Free space
         if: inputs.os != 'windows'
         run: ./scripts/github-actions/free-disk-space.sh
@@ -120,6 +119,9 @@ jobs:
         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: Run Bazel
         run: ${{ inputs.run }}
       - name: Start SSH session

.github/workflows/build-selenium-manager.yml

@@ -1,88 +1,138 @@
-name: build-selenium-manager
+name: Build selenium-manager
 
-on: workflow_dispatch
+on:
+  workflow_dispatch:
+    inputs:
+      debug:
+        description: 'Include debug symbols in binaries'
+        required: false
+        type: boolean
 
 jobs:
   win32:
     name: "[Windows x32] Build selenium-manager"
     runs-on: windows-latest
-    env:
-      RUSTFLAGS: '-Ctarget-feature=+crt-static'
     steps:
       - name: "Checkout project"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: "Update Rust"
         run: |
           rustup update
-          rustup toolchain install stable-i686-pc-windows-msvc
-          rustup default stable-i686-pc-windows-msvc
+          rustup toolchain install stable-i686-pc-windows-gnu
+          rustup default stable-i686-pc-windows-gnu
           rustc -vV
-      - name: "Build release"
+      - name: "Build release binary"
+        if: ${{ inputs.debug == false }}
         run: |
           cd rust
           cargo build --release
-      - name: "Upload binary"
+      - name: "Upload release binary"
+        if: ${{ inputs.debug == false }}
         uses: actions/upload-artifact@v3
         with:
           name: selenium-manager_windows-x32
           path: rust/target/release/selenium-manager.exe
           retention-days: 6
+      - name: "Build debug binary"
+        if: ${{ inputs.debug == true }}
+        run: |
+          cd rust
+          cargo build --profile dev
+      - name: "Upload debug binary"
+        if: ${{ inputs.debug == true }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: selenium-manager_windows-x32-debug
+          path: rust/target/debug/selenium-manager.exe
+          retention-days: 6
 
   linux64:
     name: "[Linux x64] Build selenium-manager"
     runs-on: ubuntu-latest
-    env:
-      RUSTFLAGS: '-Ctarget-feature=-crt-static'
     steps:
       - name: "Checkout project"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: "Update Rust"
         run: |
           rustup update
           rustc -vV
-      - name: "Install zig"
+      - name: "Install cross"
         run: |
-          sudo snap install zig --beta --classic
-      - name: "Build release"
+          cargo install cross --git https://github.com/cross-rs/cross
+          cross -V
+      - name: "Build release binary"
+        if: ${{ inputs.debug == false }}
         run: |
           cd rust
-          cargo install cargo-zigbuild
-          rustup target add x86_64-unknown-linux-musl
-          cargo zigbuild --release --target x86_64-unknown-linux-musl
-      - name: "Tar binary (to keep executable permission)"
-        run: |
-          cd rust/target/x86_64-unknown-linux-musl/release
+          cross build --target x86_64-unknown-linux-musl --release
+          cd target/x86_64-unknown-linux-musl/release
           tar -cvf ../../../../selenium-manager.tar selenium-manager
-      - name: "Upload binary"
+      - name: "Upload release binary"
+        if: ${{ inputs.debug == false }}
         uses: actions/upload-artifact@v3
         with:
           name: selenium-manager_linux-x64
           path: selenium-manager.tar
           retention-days: 6
+      - name: "Build debug binary"
+        if: ${{ inputs.debug == true }}
+        run: |
+          cd rust
+          cross build --target x86_64-unknown-linux-musl --profile dev
+          cd target/x86_64-unknown-linux-musl/debug
+          tar -cvf ../../../../selenium-manager.tar selenium-manager
+      - name: "Upload debug binary"
+        if: ${{ inputs.debug == true }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: selenium-manager_linux-x64-debug
+          path: selenium-manager.tar
+          retention-days: 6
 
   macos64:
-    name: "[macOS x64] Build selenium-manager"
+    name: "[macOS x64/arm64] Build selenium-manager"
     runs-on: macos-latest
-    env:
-      RUSTFLAGS: '-Ctarget-feature=+crt-static'
     steps:
       - name: "Checkout project"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: "Update Rust"
         run: |
           rustup update
+          rustup target add aarch64-apple-darwin
           rustc -vV
-      - name: "Build release"
+      - name: "Build release binary"
+        if: ${{ inputs.debug == false }}
         run: |
           cd rust
-          cargo build --release --target x86_64-apple-darwin
-      - name: "Tar binary (to keep executable permission)"
+          cargo build --target x86_64-apple-darwin --release
+          cargo build --target aarch64-apple-darwin --release
+          lipo -create -output target/selenium-manager \
+            target/aarch64-apple-darwin/release/selenium-manager \
+            target/x86_64-apple-darwin/release/selenium-manager
+          cd target
+          tar -cvf ../../selenium-manager.tar selenium-manager
+      - name: "Upload release binary"
+        if: ${{ inputs.debug == false }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: selenium-manager_macos-universal
+          path: selenium-manager.tar
+          retention-days: 6
+      - name: "Build debug binary"
+        if: ${{ inputs.debug == true }}
         run: |
-          cd rust/target/x86_64-apple-darwin/release
-          tar -cvf ../../../../selenium-manager.tar selenium-manager
-      - name: "Upload binary"
+          cd rust
+          cargo build --target x86_64-apple-darwin --profile dev
+          cargo build --target aarch64-apple-darwin --profile dev
+          lipo -create -output target/selenium-manager \
+            target/aarch64-apple-darwin/debug/selenium-manager \
+            target/x86_64-apple-darwin/debug/selenium-manager
+          cd target
+          tar -cvf ../../selenium-manager.tar selenium-manager
+      - name: "Upload debug binary"
+        if: ${{ inputs.debug == true }}
         uses: actions/upload-artifact@v3
         with:
-          name: selenium-manager_macos-x64
+          name: selenium-manager_macos-universal-debug
           path: selenium-manager.tar
           retention-days: 6

.github/workflows/ci-dotnet.yml

@@ -10,37 +10,19 @@ jobs:
     uses: ./.github/workflows/bazel.yml
     with:
       name: Build
-      cache-key: dotnet-build
+      cache-key: false
       os: windows
-      run: bazel build //dotnet/src/webdriver:package //dotnet/src/support:package
+      run: |
+        bazel build //dotnet/src/webdriver --stamp
+        bazel build //dotnet/src/support --stamp
 
   integration-tests:
     name: Browser Tests
-    needs: build
     uses: ./.github/workflows/bazel.yml
-    strategy:
-      fail-fast: false
-      matrix:
-        driver:
-          - Chrome
-          - Firefox
-        framework:
-          - net48
-          - net6.0
-          - netcoreapp3.1
-        include:
-          - driver: Chrome
-            browser: chrome
-          - driver: Firefox
-            browser: chrome
     with:
-      name: Browser Tests (${{ matrix.driver }}, ${{ matrix.framework }})
-      browser: ${{ matrix.browser }}
-      cache-key: dotnet-${{ matrix.browser }}-${{ matrix.framework }}
-      java-version: 11
+      name: Browser Tests
+      cache-key: false
+      java-version: 17
       os: windows
       run: |
-        bazel build //dotnet/test/common:${{ matrix.browser }}
-        $env:ACTIVE_DRIVER_CONFIG = '${{ matrix.driver }}'
-        cd dotnet
-        dotnet test test/common/WebDriver.Common.Tests.csproj --framework ${{ matrix.framework }}
+        bazel test //dotnet/test/common:ElementFindingTest-firefox //dotnet/test/common:ElementFindingTest-chrome --pin_browsers=true --stamp