Skip to content
This repository was archived by the owner on Jul 31, 2023. It is now read-only.

Commit 7d6b5bd

Browse files
authored
Windows: remove --output_user_root workaround. (#198)
It's no longer required, new versions of bazel fix the problem of long paths.
1 parent 03abe58 commit 7d6b5bd

3 files changed

Lines changed: 4 additions & 6 deletions

File tree

tools/appveyor/build.bat

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@ FOR /F usebackq %%T IN (`bazel query "kind(rule, //...)" ^| FINDSTR /C:"\:_" /V`
2121
SET BUILDABLES=!BUILDABLES! %%T
2222
)
2323

24-
REM TODO: Remove --output_user_root after https://github.com/bazelbuild/bazel/issues/4149 is fixed.
2524
REM TODO: enable the full build when errors are resolved.
26-
bazel --output_user_root=c:/t/ build //opencensus/trace //opencensus/stats
27-
REM bazel --output_user_root=c:/t/ build %BUILDABLES%
25+
bazel build //opencensus/trace //opencensus/stats
26+
REM bazel build %BUILDABLES%
2827

2928
IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
3029
EXIT /b 0

tools/appveyor/install.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ IF NOT EXIST %INSTALL_CACHE% (MKDIR %INSTALL_CACHE%)
1919

2020
REM Download bazel into install cache, which is on the path.
2121
IF NOT EXIST %INSTALL_CACHE%\bazel.exe (
22-
appveyor DownloadFile https://github.com/bazelbuild/bazel/releases/download/0.11.1/bazel-0.11.1-without-jdk-windows-x86_64.exe -FileName %INSTALL_CACHE%\bazel.exe
22+
appveyor DownloadFile https://github.com/bazelbuild/bazel/releases/download/0.17.1/bazel-0.17.1-windows-x86_64.exe -FileName %INSTALL_CACHE%\bazel.exe
2323
)
2424

2525
REM Temporary directory for bazel.

tools/appveyor/test.bat

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ FOR /F usebackq %%T IN (`bazel query "kind(test, //...) except attr('tags', 'ma
2121
SET TESTS=!TESTS! %%T
2222
)
2323

24-
REM TODO: Remove --output_user_root after https://github.com/bazelbuild/bazel/issues/4149 is fixed.
2524
echo TODO: Make all tests pass on Windows.
26-
REM bazel --output_user_root=c:/t/ test --test_output=errors %TESTS%
25+
REM bazel test --test_output=errors %TESTS%
2726

2827
IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
2928
EXIT /b 0

0 commit comments

Comments
 (0)