Skip to content

Commit bb2af3c

Browse files
Utilise release-validate-deps rule instead of script (#66)
## What is the goal of this PR? Utilise release-validate-deps rule instead of script. ## What are the changes implemented in this PR?
1 parent b7cdce5 commit bb2af3c

File tree

4 files changed

+20
-3
lines changed

4 files changed

+20
-3
lines changed

.circleci/config.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,7 @@ jobs:
123123
steps:
124124
- install-bazel
125125
- checkout
126-
- run: |
127-
bazel run @graknlabs_dependencies//tool/release:validate-deps -- \
128-
graknlabs_common graknlabs_graql graknlabs_client_java
126+
- run: bazel test //:release-validate-deps --test_output=streamed
129127

130128
deploy-artifact:
131129
machine: true

BUILD

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
2121
load("@graknlabs_dependencies//distribution/artifact:rules.bzl", "deploy_artifact")
2222
load("@graknlabs_dependencies//distribution/maven:rules.bzl", "assemble_maven", "deploy_maven")
2323
load("@graknlabs_dependencies//tool/checkstyle:rules.bzl", "checkstyle_test")
24+
load("@graknlabs_dependencies//tool/release:rules.bzl", "release_validate_deps")
2425
load("@graknlabs_bazel_distribution//common:rules.bzl", "assemble_targz", "java_deps", "assemble_zip", "assemble_versioned")
2526
load("@graknlabs_bazel_distribution//github:rules.bzl", "deploy_github")
2627
load("@graknlabs_bazel_distribution//apt:rules.bzl", "assemble_apt", "deploy_apt")
@@ -187,3 +188,15 @@ deploy_rpm(
187188
target = ":assemble-linux-rpm",
188189
deployment_properties = "@graknlabs_dependencies//distribution:deployment.properties",
189190
)
191+
192+
193+
release_validate_deps(
194+
name = "release-validate-deps",
195+
refs = "@graknlabs_console_workspace_refs//:refs.json",
196+
tagged_deps = [
197+
"graknlabs_common",
198+
"graknlabs_graql",
199+
"graknlabs_client_java",
200+
],
201+
tags = ["manual"] # in order for bazel test //... to not fail
202+
)

WORKSPACE

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories", "kt_reg
5656
kotlin_repositories()
5757
kt_register_toolchains()
5858

59+
# Load Kotlin Maven Dependencies
60+
load("@graknlabs_dependencies//dependencies/maven:artifacts.bzl", graknlabs_dependencies_artifacts = "artifacts")
61+
5962
# Load NodeJS
6063
load("@graknlabs_dependencies//builder/nodejs:deps.bzl", nodejs_deps = "deps")
6164
nodejs_deps()
@@ -183,6 +186,7 @@ graknlabs_grakn_core_artifact()
183186
# Load @maven #
184187
###############
185188
maven(
189+
graknlabs_dependencies_artifacts +
186190
graknlabs_grabl_tracing_artifacts +
187191
graknlabs_graql_artifacts +
188192
graknlabs_client_java_artifacts +

dependencies/maven/artifacts.snapshot

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
@maven//:ch_qos_logback_logback_classic_1_2_3
33
@maven//:ch_qos_logback_logback_core
44
@maven//:ch_qos_logback_logback_core_1_2_3
5+
@maven//:com_eclipsesource_minimal_json_minimal_json
6+
@maven//:com_eclipsesource_minimal_json_minimal_json_0_9_5
57
@maven//:com_google_android_annotations
68
@maven//:com_google_android_annotations_4_1_1_4
79
@maven//:com_google_api_grpc_proto_google_common_protos

0 commit comments

Comments
 (0)