Skip to content

Commit

Permalink
Upgrade to Bazel 3.0.0 (typedb#129)
Browse files Browse the repository at this point in the history
## What is the goal of this PR?

Upgrade Bazel to latest upstream version

## What are the changes implemented in this PR?

Update `.bazelversion` and bump `build_tools` version
  • Loading branch information
vmax authored Apr 14, 2020
1 parent 0608e59 commit 7c4644d
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 7 deletions.
5 changes: 4 additions & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
build --incompatible_disable_deprecated_attr_params=false
build --incompatible_disable_deprecated_attr_params=false --incompatible_strict_action_env
run --incompatible_strict_action_env
test --incompatible_strict_action_env

1 change: 1 addition & 0 deletions .bazelversion
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0.0
11 changes: 7 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,16 @@ commands:
- install-bazel-linux-rbe
- install-python
- run: bazel build @graknlabs_grakn_core//:assemble-linux-targz
- run: mkdir dist && tar -xvzf bazel-genfiles/external/graknlabs_grakn_core/grakn-core-all-linux.tar.gz -C ./dist/
- run: mkdir dist && tar -xvzf bazel-bin/external/graknlabs_grakn_core/grakn-core-all-linux.tar.gz -C ./dist/
- run: nohup ./dist/grakn-core-all-linux/grakn server start

install-python:
steps:
- run: pyenv install 3.6.3
- run: pyenv global 3.6.3
- run: sudo unlink /usr/bin/python3
- run: sudo ln -s $(which python3) /usr/bin/python3
- run: sudo sed -i -e 's|python3|python|g' $(which lsb_release)

jobs:
build:
Expand All @@ -38,7 +41,7 @@ jobs:
- install-bazel-linux-rbe
- checkout
- install-python
- run: bazel test //kglib/... --test_output=streamed --spawn_strategy=standalone --python_version PY3 --python_path $(which python)
- run: bazel test //kglib/... --test_output=streamed --spawn_strategy=standalone

test-end-to-end:
machine: true
Expand All @@ -47,14 +50,14 @@ jobs:
- install-bazel-linux-rbe
- checkout
- install-python
- run: bazel test //tests/end_to_end/... --test_output=streamed --spawn_strategy=standalone --python_version PY3 --python_path $(which python)
- run: bazel test //tests/end_to_end/... --test_output=streamed --spawn_strategy=standalone

test-markdown-link-health:
machine: true
working_directory: ~/kglib
steps:
- checkout
- run: find . -name \*.md | xargs -L1 npx markdown-link-check -v
- run: find . -name \*.md | xargs -L1 npx markdown-link-check@3.8.0 -v

deploy-pip-snapshot:
machine: true
Expand Down
8 changes: 7 additions & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,20 @@ load(
"graknlabs_protocol",
"graknlabs_client_java",
"graknlabs_console",
"graknlabs_benchmark"
"graknlabs_benchmark",
"graknlabs_grabl_tracing"
)
graknlabs_graql()
graknlabs_common()
graknlabs_protocol()
graknlabs_client_java()
graknlabs_console()
graknlabs_benchmark()
graknlabs_grabl_tracing()

load("@graknlabs_grabl_tracing//dependencies/maven:dependencies.bzl",
graknlabs_grabl_tracing_maven_dependencies="maven_dependencies")
graknlabs_grabl_tracing_maven_dependencies()

# Skip since these are already present above
#load("@graknlabs_build_tools//distribution:dependencies.bzl", "graknlabs_bazel_distribution")
Expand Down
2 changes: 1 addition & 1 deletion dependencies/graknlabs/dependencies.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ def graknlabs_build_tools():
git_repository(
name = "graknlabs_build_tools",
remote = "https://github.com/graknlabs/build-tools",
commit = "c71c07b9ff704f2521319b77d4dbfa27606182f9", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_build_tools
commit = "6cf8cad67fa232d020869fde84e56984bf36d5e7", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_build_tools
)


Expand Down

0 comments on commit 7c4644d

Please sign in to comment.