Skip to content

Commit

Permalink
Revert "Refactor WORKSPACE and add filegroup declaring CI targets (ty…
Browse files Browse the repository at this point in the history
…pedb#329)"

This reverts commit 2ed2965.
  • Loading branch information
Ganeshwara Hananda committed Sep 2, 2020
1 parent 2ed2965 commit ea29f76
Show file tree
Hide file tree
Showing 8 changed files with 651 additions and 1,070 deletions.
28 changes: 7 additions & 21 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,6 @@ commands:
steps:
- run: bazel run @graknlabs_dependencies//tool/bazelrun:rbe -- << parameters.command >>

install-artifact-credentials:
steps:
- run: |
ARTIFACT_USERNAME=$REPO_GRAKN_USERNAME \
ARTIFACT_PASSWORD=$REPO_GRAKN_PASSWORD \
bazel run @graknlabs_dependencies//distribution/artifact:create-netrc
run-grakn-server:
steps:
- run-bazel:
Expand All @@ -51,9 +44,8 @@ jobs:
image: ubuntu-1604:201903-01
working_directory: ~/docs
steps:
- checkout
- install-bazel
- install-artifact-credentials
- checkout
- run-bazel:
command: bazel build //...
- run:
Expand All @@ -70,9 +62,8 @@ jobs:
image: ubuntu-1604:201903-01
working_directory: ~/docs
steps:
- checkout
- install-bazel
- install-artifact-credentials
- checkout
- run-bazel:
command: bazel test //test/query:graql-lang --test_output=errors

Expand All @@ -81,9 +72,8 @@ jobs:
image: ubuntu-1604:201903-01
working_directory: ~/docs
steps:
- checkout
- install-bazel
- install-artifact-credentials
- checkout
- run-bazel:
command: bazel test //test/query:graql-java --test_output=errors

Expand All @@ -92,9 +82,8 @@ jobs:
image: ubuntu-1604:201903-01
working_directory: ~/docs
steps:
- checkout
- install-bazel
- install-artifact-credentials
- checkout
- run-grakn-server
- run: bazel test //test/example/java:phone-calls --test_output=errors
- run: bazel test //test/example/java:social-network --test_output=errors
Expand All @@ -104,9 +93,8 @@ jobs:
image: ubuntu-1604:201903-01
working_directory: ~/docs
steps:
- checkout
- install-bazel
- install-artifact-credentials
- checkout
- run-grakn-server
- run: bazel test //test/example/nodejs:phone-calls --test_output=errors
- run: bazel test //test/example/nodejs:social-network --test_output=errors
Expand All @@ -116,9 +104,8 @@ jobs:
image: ubuntu-1604:201903-01
working_directory: ~/docs
steps:
- checkout
- install-bazel
- install-artifact-credentials
- checkout
- run-grakn-server
- run: bazel test //test/example/python:phone-calls --test_output=errors
- run: bazel test //test/example/python:social-network --test_output=errors
Expand All @@ -128,9 +115,8 @@ jobs:
image: ubuntu-1604:201903-01
working_directory: ~/docs
steps:
- checkout
- install-bazel
- install-artifact-credentials
- checkout
- run: bazel test //test/links:test --test_output=errors

release-staging:
Expand Down
12 changes: 1 addition & 11 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
## sub-sub-dir:
## test-2.md

load("@graknlabs_bazel_distribution//artifact:rules.bzl", "artifact_extractor")
load("@graknlabs_dependencies//distribution/artifact:rules.bzl", "artifact_extractor")

filegroup(
name = "content",
Expand Down Expand Up @@ -47,13 +47,3 @@ artifact_extractor(
name = "grakn-extractor",
artifact = "@graknlabs_grakn_core_artifact//file",
)

# CI targets that are not declared in any BUILD file, but are called externally
filegroup(
name = "ci",
data = [
"@graknlabs_dependencies//tool/bazelrun:rbe",
"@graknlabs_dependencies//tool/unuseddeps:unused-deps",
"@graknlabs_dependencies//tool/release:docs",
],
)
Loading

0 comments on commit ea29f76

Please sign in to comment.