Skip to content

Commit 82c485b

Browse files
Bundle both architectures for mac/linux as selected console dependencies
1 parent 2f41ec6 commit 82c485b

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

.factory/automation.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,13 @@ config:
2020
dependencies:
2121
dependencies: [build]
2222
typedb-common: [build, release]
23-
typedb-client-java: [build, release]
23+
typedb-driver: [build, release]
2424

2525
build:
2626
quality:
2727
filter:
2828
owner: vaticle
2929
branch: master
30-
build-analysis:
31-
image: vaticle-ubuntu-22.04
32-
type: foreground
33-
command: |
34-
SONARCLOUD_CODE_ANALYSIS_CREDENTIAL=$SONARCLOUD_CREDENTIAL \
35-
bazel run @vaticle_dependencies//tool/sonarcloud:code-analysis -- \
36-
--project-key vaticle_typedb_console --branch=$FACTORY_BRANCH --commit-id=$FACTORY_COMMIT
3730
dependency-analysis:
3831
image: vaticle-ubuntu-22.04
3932
command: |

BUILD

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,19 @@ java_library(
5959
"@maven//:org_jline_jline_terminal_jansi",
6060
"@maven//:info_picocli_picocli",
6161
"@maven//:org_slf4j_slf4j_api",
62-
],
62+
] + select({
63+
"@vaticle_dependencies//util/platform:is_mac": [
64+
"@vaticle_typedb_driver//java:typedb_driver_jni-macosx-aarch64__do_not_reference",
65+
"@vaticle_typedb_driver//java:typedb_driver_jni-macosx-x86_64__do_not_reference",
66+
],
67+
"@vaticle_dependencies//util/platform:is_windows": [
68+
"@vaticle_typedb_driver//java:typedb_driver_jni-windows-x86_64__do_not_reference",
69+
],
70+
"@vaticle_dependencies//util/platform:is_linux": [
71+
"@vaticle_typedb_driver//java:typedb_driver_jni-linux-aarch64__do_not_reference",
72+
"@vaticle_typedb_driver//java:typedb_driver_jni-linux-x86_64__do_not_reference",
73+
],
74+
}),
6375
visibility = ["//visibility:public"],
6476
resources = ["LICENSE"],
6577
tags = ["maven_coordinates=com.vaticle.typedb:typedb-console:{pom_version}"],

dependencies/vaticle/repositories.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ def vaticle_typedb_driver():
3535
git_repository(
3636
name = "vaticle_typedb_driver",
3737
remote = "https://github.com/vaticle/typedb-driver",
38-
commit = "8c410a4a1332875b79333457ff63d5cf80861989", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_driver
38+
commit = "ddd6b9eb0c93d1e0e9beca43843fe0856cd1e757", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_driver
3939
)

0 commit comments

Comments
 (0)