deploy-brew (typedb#5074)

## What is the goal of this PR? To make `//:deploy-brew` correctly validate the checksum of the assembled distribution. ## What are the changes implemented in this PR? Use the latest `deploy_brew` rule from `@graknlabs_bazel_distribution`.
mauna-ai · Mar 29, 2019 · 337cc27 · 337cc27
1 parent 1db9799
commit 337cc27
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 43 deletions.
diff --git a/BUILD b/BUILD
@@ -19,43 +19,12 @@
 exports_files(["VERSION", "deployment.properties", "RELEASE_TEMPLATE.md"], visibility = ["//visibility:public"])
 load("@graknlabs_bazel_distribution//apt:rules.bzl", "assemble_apt", "deploy_apt")
 load("@graknlabs_bazel_distribution//brew:rules.bzl", "deploy_brew")
-load("@graknlabs_bazel_distribution//common:rules.bzl", "assemble_targz", "java_deps", "assemble_zip", "checksum")
+load("@graknlabs_bazel_distribution//common:rules.bzl", "assemble_targz", "java_deps", "assemble_zip", "checksum", "assemble_versioned")
 load("@graknlabs_bazel_distribution//github:rules.bzl", "deploy_github")
 load("@graknlabs_bazel_distribution//rpm:rules.bzl", "assemble_rpm", "deploy_rpm")
 load("@io_bazel_rules_docker//container:image.bzl", "container_image")
 load("@io_bazel_rules_docker//container:container.bzl", "container_push")
 
-deploy_github(
-    name = "deploy-github",
-    deployment_properties = "//:deployment.properties",
-    release_description = "//:RELEASE_TEMPLATE.md",
-    targets = [
-        ":assemble-linux-targz",
-        ":assemble-mac-zip",
-        ":assemble-windows-zip",
-        "//console:assemble-linux-targz",
-        "//console:assemble-mac-zip",
-        "//console:assemble-windows-zip",
-        "//server:assemble-linux-targz",
-        "//server:assemble-mac-zip",
-        "//server:assemble-windows-zip",
-    ],
-    version_file = "//:VERSION"
-)
-
-deploy_brew(
-    name = "deploy-brew",
-    checksum = "//:checksum",
-    deployment_properties = "@graknlabs_build_tools//:deployment.properties",
-    formula = "//config/brew:grakn-core.rb",
-    version_file = "//:VERSION"
-)
-
-checksum(
-    name = "checksum",
-    target = ":assemble-mac-zip"
-)
-
 assemble_targz(
     name = "assemble-linux-targz",
     targets = ["//server:server-deps",
@@ -146,6 +115,49 @@ assemble_apt(
     ],
 )
 
+assemble_versioned(
+    name = "assemble-versioned-all",
+    targets = [
+        ":assemble-linux-targz",
+        ":assemble-mac-zip",
+        ":assemble-windows-zip",
+        "//console:assemble-linux-targz",
+        "//console:assemble-mac-zip",
+        "//console:assemble-windows-zip",
+        "//server:assemble-linux-targz",
+        "//server:assemble-mac-zip",
+        "//server:assemble-windows-zip",
+    ],
+    version_file = "//:VERSION",
+)
+
+assemble_versioned(
+    name = "assemble-versioned-mac",
+    targets = [":assemble-mac-zip"],
+    version_file = "//:VERSION"
+)
+
+checksum(
+    name = "checksum-mac",
+    archive = ":assemble-versioned-mac",
+)
+
+deploy_github(
+    name = "deploy-github",
+    deployment_properties = "//:deployment.properties",
+    release_description = "//:RELEASE_TEMPLATE.md",
+    archive = ":assemble-versioned-all",
+    version_file = "//:VERSION"
+)
+
+deploy_brew(
+    name = "deploy-brew",
+    checksum = "//:checksum-mac",
+    deployment_properties = "@graknlabs_build_tools//:deployment.properties",
+    formula = "//config/brew:grakn-core.rb",
+    version_file = "//:VERSION"
+)
+
 deploy_rpm(
     name = "deploy-rpm",
     target = ":assemble-linux-rpm",

diff --git a/dependencies/graknlabs/dependencies.bzl b/dependencies/graknlabs/dependencies.bzl
@@ -18,30 +18,30 @@
 
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
+def graknlabs_build_tools():
+    git_repository(
+        name = "graknlabs_build_tools",
+        remote = "https://github.com/graknlabs/build-tools",
+        commit = "e19716677d5c773faf47ad55f1096e517eeaaa2c", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_build_tools
+    )
+
 def graknlabs_graql():
      git_repository(
          name = "graknlabs_graql",
          remote = "https://github.com/graknlabs/graql",
-         commit = "e452fd0eee312264eea6255f94ce7c46d805d04c",
+         commit = "5e5dcae851bbaeb187f1f2eb454809e91594fd5a",
      )
 
 def graknlabs_client_java():
      git_repository(
          name = "graknlabs_client_java",
          remote = "https://github.com/graknlabs/client-java",
-         commit = "e6fc5d0c9a5d998dddb0d0c7bc50358bd9d6428e",
+         commit = "f05f42a1cbfc11ec98846bb9e12b7d07fd4f3f9d",
      )
 
 def graknlabs_benchmark():
     git_repository(
         name = "graknlabs_benchmark",
         remote = "https://github.com/graknlabs/benchmark.git",
         commit = "ceb5a2ebb71ee526d788fb4b17a104a6669d4b70" # keep in sync with protocol changes
-    )
-
-def graknlabs_build_tools():
-    git_repository(
-        name = "graknlabs_build_tools",
-        remote = "https://github.com/graknlabs/build-tools",
-        commit = "d8a9ed07cf2dae5927c9cffcdb7aa75a40bc71d1", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_build_tools
-    )
+    )
diff --git a/deployment.properties b/deployment.properties
@@ -17,4 +17,4 @@
 #
 
 repo.github.organisation=graknlabs
-repo.github.repository=grakn
+repo.github.repository=grakn