Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify .bazelrc #612

Merged
merged 5 commits into from
Nov 27, 2019
Merged

Simplify .bazelrc #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c687bf2
bazel_pandoc fixed the depset problem. We can remove the --incompatib…
regisd Nov 25, 2019
abb6352
Bazel coverage aggration doesn't work. Just disable it.
regisd Nov 25, 2019
419a8ee
bazel_pandoc-0.2 was released before the fix. Checkout the current he…
regisd Nov 26, 2019
a95f62c
typo: ant should use ant, not make!
regisd Nov 26, 2019
3564ee8
Remove old Xmx setup.
regisd Nov 26, 2019
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
13 changes: 4 additions & 9 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
# This incompatible change was introduced in Bazel 0.26
# https://github.com/bazelbuild/bazel/issues/5817
# bazel_pandoc needs to update
# https://github.com/ProdriveTechnologies/bazel-pandoc/issues/6
build --incompatible_depset_union=false

test --test_output=errors
test --combined_report=lcov
# https://github.com/bazelbuild/bazel/issues/6450
test --coverage_report_generator="@bazel_tools//tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator:Main"

# https://github.com/ProdriveTechnologies/bazel-pandoc/issues/6
# test --combined_report=lcov
# test --coverage_report_generator="@bazel_tools//tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator:Main"

# http://errorprone.info/bugpatterns
# To avoid bugs in the code
Expand Down
4 changes: 0 additions & 4 deletions .ci.bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import %workspace%/.bazelrc

# This is from Bazel's former travis setup, to avoid blowing up the RAM usage.
startup --host_jvm_args=-Xms2000m
startup --host_jvm_args=-Xmx3000m

# This is so we understand failures better
build --verbose_failures
test --test_output=errors
Expand Down
17 changes: 13 additions & 4 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,20 @@ jflex_deps()

# pandoc used to build the documentatoin

http_archive(
#http_archive(
# name = "bazel_pandoc",
# sha256 = "47ad1f08db3e6c8cc104931c11e099fd0603c174400b9cc852e2481abe08db24",
# strip_prefix = "bazel-pandoc-0.2",
# url = "https://github.com/ProdriveTechnologies/bazel-pandoc/archive/v0.2.tar.gz",
#)

# The unionset incompatible change was introduced in Bazel 0.26
# bazel_pandoc needs to update
# https://github.com/ProdriveTechnologies/bazel-pandoc/issues/6
git_repository(
name = "bazel_pandoc",
sha256 = "47ad1f08db3e6c8cc104931c11e099fd0603c174400b9cc852e2481abe08db24",
strip_prefix = "bazel-pandoc-0.2",
url = "https://github.com/ProdriveTechnologies/bazel-pandoc/archive/v0.2.tar.gz",
commit = "7d87bb1463835bfea8438a5dae8f536d1857c97f",
remote = "https://github.com/ProdriveTechnologies/bazel-pandoc.git",
)

load("@bazel_pandoc//:repositories.bzl", "pandoc_repositories")
Expand Down
2 changes: 1 addition & 1 deletion scripts/test-examples.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fi

which ant
if [[ $? -eq 0 ]]; then
ANT=make
ANT=ant
else
ANT=echo
fi
Expand Down