Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,7 @@ rust/target
rust/.idea

# Bazel stuff
bazel-bin
bazel-genfiles
bazel-out
bazel-selenium
bazel-testlogs
/bazel-*
MODULE.bazel.lock

/.vscode/
Expand Down
12 changes: 8 additions & 4 deletions dotnet/private/docfx.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,18 @@ def _docfx_impl(ctx):
_UNIX_TEMPLATE = """#!/usr/bin/env bash
set -euo pipefail
cd "$BUILD_WORKSPACE_DIRECTORY"
exec "$BUILD_WORKSPACE_DIRECTORY/bazel-selenium/{dotnet}" exec \
"$BUILD_WORKSPACE_DIRECTORY/bazel-selenium/{docfx}" {config} "$@"
EXEC_ROOT=$(bazel info execution_root)
exec "$EXEC_ROOT/{dotnet}" exec \
"$EXEC_ROOT/{docfx}" {config} "$@"
"""

_WINDOWS_TEMPLATE = """@echo off
setlocal
cd /d "%BUILD_WORKSPACE_DIRECTORY%"
"%BUILD_WORKSPACE_DIRECTORY%\\bazel-selenium\\{dotnet}" exec ^
"%BUILD_WORKSPACE_DIRECTORY%\\bazel-selenium\\{docfx}" {config} %*
for /f "tokens=*" %%i in ('bazel info execution_root') do set "EXEC_ROOT=%%i"
"%EXEC_ROOT%\\{dotnet}" exec ^
"%EXEC_ROOT%\\{docfx}" {config} %*
endlocal
"""

docfx = rule(
Expand Down
8 changes: 6 additions & 2 deletions dotnet/update-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
REPO_ROOT="$SCRIPT_DIR/.."

if [[ -d "$REPO_ROOT/bazel-selenium/external" ]]; then
DOTNET_DIR=$(find "$REPO_ROOT/bazel-selenium/external" -maxdepth 1 -name "rules_dotnet++dotnet+dotnet_*" -type d | head -1)
OUTPUT_BASE=$(cd "$REPO_ROOT" && bazel info output_base 2>/dev/null)
if [[ -n "$OUTPUT_BASE" && -d "$OUTPUT_BASE/external" ]]; then
EXTERNAL_DIR="$OUTPUT_BASE/external"
DOTNET_DIR=$(find "$EXTERNAL_DIR" -maxdepth 1 -name "rules_dotnet++dotnet+dotnet_*" -type d 2>/dev/null | head -1)
if [[ -n "$DOTNET_DIR" && -x "$DOTNET_DIR/dotnet" ]]; then
DOTNET="$DOTNET_DIR/dotnet"
echo "Using bazel-managed dotnet: $DOTNET"
fi
else
echo "Warning: bazel info output_base failed; falling back to system dotnet" >&2
fi
DOTNET="${DOTNET:-dotnet}"

Expand Down