Skip to content
This repository has been archived by the owner on Nov 18, 2023. It is now read-only.

Commit

Permalink
Fix release approval and validate-deps (#148)
Browse files Browse the repository at this point in the history
## What is the goal of this PR?

We update release approval and validate-deps to match the latest build updates
  • Loading branch information
jmsfltchr authored Aug 19, 2020
1 parent 2d4c85a commit 2aeef25
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 7 deletions.
5 changes: 2 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
- run: |
export RELEASE_APPROVAL_USERNAME=$REPO_GITHUB_USERNAME
export RELEASE_APPROVAL_TOKEN=$REPO_GITHUB_TOKEN
bazel run @graknlabs_build_tools//ci:release-approval
bazel run @graknlabs_dependencies//tool/release:approval
release-validate:
machine:
Expand All @@ -125,8 +125,7 @@ jobs:
- checkout
- install-python
- run: |
bazel run @graknlabs_build_tools//ci:release-validate-deps -- \
graknlabs_grakn_core graknlabs_client_python
bazel test //:release-validate-deps --test_output=streamed
deploy-github:
machine:
Expand Down
12 changes: 12 additions & 0 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,15 @@ artifact_extractor(
name = "grakn-extractor",
artifact = "@graknlabs_grakn_core_artifact//file",
)

load("@graknlabs_dependencies//tool/release:rules.bzl", "release_validate_deps")

release_validate_deps(
name = "release-validate-deps",
refs = "@graknlabs_kglib_workspace_refs//:refs.json",
tagged_deps = [
# "graknlabs_grakn_core", # TODO We cannot currently use a released grakn for tests as 1.8.0 has an outdated build pipeline
"graknlabs_client_python",
],
tags = ["manual"]
)
33 changes: 31 additions & 2 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ load("@graknlabs_dependencies//builder/java:deps.bzl", java_deps = "deps")
java_deps()
load("@graknlabs_dependencies//library/maven:rules.bzl", "maven")

# Load Kotlin
load("@graknlabs_dependencies//builder/kotlin:deps.bzl", kotlin_deps = "deps")
kotlin_deps()
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains")
kotlin_repositories()
kt_register_toolchains()

# Load Python
load("@graknlabs_dependencies//builder/python:deps.bzl", python_deps = "deps")
python_deps(use_patched_version=True)
Expand All @@ -54,12 +61,19 @@ load("@graknlabs_dependencies_ci_pip//:requirements.bzl",
graknlabs_dependencies_ci_pip_install = "pip_install")
graknlabs_dependencies_ci_pip_install()

# Load distribution deps
load("@graknlabs_dependencies//distribution:deps.bzl", distribution_deps = "deps")
distribution_deps()

# Load maven artifacts
load("@graknlabs_dependencies//dependencies/maven:artifacts.bzl", graknlabs_dependencies_artifacts = "artifacts")

#####################################################################
# Load @graknlabs_bazel_distribution (from @graknlabs_dependencies) #
#####################################################################
load("@graknlabs_dependencies//distribution:deps.bzl", distribution_deps = "deps")
distribution_deps()

load("@graknlabs_dependencies//dependencies/graknlabs:repositories.bzl", "graknlabs_bazel_distribution")
graknlabs_bazel_distribution()

pip3_import(
name = "graknlabs_bazel_distribution_pip",
Expand Down Expand Up @@ -121,3 +135,18 @@ pip3_import(
load("@graknlabs_kglib_pip//:requirements.bzl",
graknlabs_kglib_pip_install = "pip_install")
graknlabs_kglib_pip_install()

##############
# Load @maven #
##############
maven(
graknlabs_dependencies_artifacts
)

############################################
# Create @graknlabs_console_workspace_refs #
############################################
load("@graknlabs_bazel_distribution//common:rules.bzl", "workspace_refs")
workspace_refs(
name = "graknlabs_kglib_workspace_refs"
)
4 changes: 2 additions & 2 deletions dependencies/graknlabs/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def graknlabs_dependencies():
git_repository(
name = "graknlabs_dependencies",
remote = "https://github.com/graknlabs/dependencies",
commit = "8e4200dfb556f1b64db78f2223488b3ced80df75", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_dependencies
commit = "633cc1f4b457f18c5ad93c2fb28b044537a95ed8", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_dependencies
)

def graknlabs_protocol():
Expand All @@ -36,5 +36,5 @@ def graknlabs_client_python():
git_repository(
name = "graknlabs_client_python",
remote = "https://github.com/graknlabs/client-python",
commit = "4b8dd3f865ef528cbae60a27eb7d67d9fe4663be", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_client_python
tag = "1.8.0", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_client_python
)

0 comments on commit 2aeef25

Please sign in to comment.