Skip to content

Commit a7db8e4

Browse files
authored
Merge for 2.28.2-rc1 release (#249)
## Usage and product changes We merge development into master for 2.28.0-rc0 release.
2 parents 489f80b + 7f1d511 commit a7db8e4

File tree

7 files changed

+22
-41
lines changed

7 files changed

+22
-41
lines changed

.circleci/config.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,11 @@ executors:
3737
xcode: "13.4.1"
3838
working_directory: ~/typedb-console
3939

40+
win-x86_64:
41+
resource_class: windows.xlarge
42+
machine:
43+
image: windows-server-2022-gui:2024.01.1
44+
shell: cmd.exe
4045

4146
commands:
4247
install-bazel-yum:
@@ -113,10 +118,7 @@ jobs:
113118
bazel run --define version=$(git rev-parse HEAD) //:deploy-mac-arm64-zip -- snapshot
114119
115120
deploy-artifact-snapshot-windows-x86_64:
116-
executor:
117-
name: win/default
118-
shell: cmd.exe
119-
size: large
121+
executor: win-x86_64
120122
working_directory: ~/typedb-driver
121123
steps:
122124
- checkout
@@ -166,10 +168,7 @@ jobs:
166168
bazel run --define version=$(cat VERSION) //:deploy-mac-arm64-zip --compilation_mode=opt -- release
167169
168170
deploy-artifact-release-windows-x86_64:
169-
executor:
170-
name: win/default
171-
shell: cmd.exe
172-
size: large
171+
executor: win-x86_64
173172
working_directory: ~/typedb-driver
174173
steps:
175174
- checkout

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
[![Factory](https://factory.vaticle.com/api/status/vaticle/typedb-console/badge.svg)](https://factory.vaticle.com/vaticle/typedb-console)
44
[![GitHub release](https://img.shields.io/github/release/vaticle/typedb-console.svg)](https://github.com/vaticle/typedb-console/releases/latest)
5-
[![Discord](https://img.shields.io/discord/665254494820368395?color=7389D8&label=chat&logo=discord&logoColor=ffffff)](https://vaticle.com/discord)
6-
[![Discussion Forum](https://img.shields.io/discourse/https/forum.vaticle.com/topics.svg)](https://forum.vaticle.com)
5+
[![Discord](https://img.shields.io/discord/665254494820368395?color=7389D8&label=chat&logo=discord&logoColor=ffffff)](https://typedb.com/discord)
6+
[![Discussion Forum](https://img.shields.io/discourse/https/forum.typedb.com/topics.svg)](https://forum.typedb.com)
77
[![Stack Overflow](https://img.shields.io/badge/stackoverflow-typedb-796de3.svg)](https://stackoverflow.com/questions/tagged/typedb)
88
[![Stack Overflow](https://img.shields.io/badge/stackoverflow-typeql-3dce8c.svg)](https://stackoverflow.com/questions/tagged/typeql)
99

RELEASE_NOTES_LATEST.md

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,10 @@
11
## Distribution
22

3-
Download from TypeDB Package Repository: https://cloudsmith.io/~typedb/repos/public-release/packages/?q=name:^typedb-console+version:2.28.0
3+
Download from TypeDB Package Repository: https://cloudsmith.io/~typedb/repos/public-release/packages/?q=name:^typedb-console+version:2.28.2-rc1
44

55

66
## New Features
7-
- **Cloud address translation**
8-
9-
We allow connection to the cloud servers using an address translation mapping (cf. https://github.com/vaticle/typedb-driver/pull/624). This is useful when the route from the user to the servers differs from the route the servers are configured with (e.g. connection to public-facing servers from an internal network).
10-
11-
Example usage:
12-
```bash
13-
console \
14-
--cloud=typedb1.domain.com:1729=typedb.local:11729,typedb2.domain.com:1729=typedb.local:21729 \
15-
--username=<user> --password=<password>
16-
```
17-
or:
18-
```bash
19-
console \
20-
--cloud=typedb1.domain.com:1729=typedb.local:11729 \
21-
--cloud=typedb2.domain.com:1729=typedb.local:21729 \
22-
--username=<user> --password=<password>
23-
```
24-
25-
Note: we currently require that the user provides translation for the addresses of _all_ nodes in the Cloud deployment.
26-
27-
7+
288

299
## Bugs Fixed
3010

@@ -33,7 +13,8 @@ Download from TypeDB Package Repository: https://cloudsmith.io/~typedb/repos/pub
3313

3414

3515
## Other Improvements
36-
- **Fix git patch for Windows build**
37-
38-
We update the git patch used for workspace path shortening in Windows CI builds.
16+
- **Turn off statistics reporting in CI**
17+
We turn off the `--diagnostics.reporting.statistics` in our CI builds not to send non-real diagnostics data.
3918

19+
In version 2.28 and earlier, this flag purely prevents `TypeDB` from sending any diagnostics data.
20+
In the upcoming version 2.28.1, this flag still allows `TypeDB` to send a single diagnostics snapshot with the information of when the diagnostics data has been turned off, but it happens only after the server runs for 1 hour, so we expect the CI builds not to reach this point and not to send any diagnostics data as well.

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.28.0
1+
2.28.2-rc1

dependencies/maven/artifacts.snapshot

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
@maven//:com_googlecode_java_diff_utils_diffutils_1_3_0
2929
@maven//:com_squareup_okhttp_okhttp_2_7_5
3030
@maven//:com_squareup_okio_okio_1_17_5
31-
@maven//:com_vaticle_typedb_typedb_cloud_runner_0_0_0_81def47a63eacbd51934e63ba842b06116643c15
32-
@maven//:com_vaticle_typedb_typedb_runner_0_0_0_fee8e9c5a8c17a58b4639b91e23458e715e0d3a3
31+
@maven//:com_vaticle_typedb_typedb_cloud_runner_2_28_0
32+
@maven//:com_vaticle_typedb_typedb_runner_2_28_0
3333
@maven//:com_vdurmont_semver4j_3_1_0
3434
@maven//:commons_codec_commons_codec_1_13
3535
@maven//:commons_io_commons_io_2_3
@@ -125,5 +125,5 @@
125125
@maven//:org_slf4j_log4j_over_slf4j_2_0_0
126126
@maven//:org_slf4j_slf4j_api_2_0_0
127127
@maven//:org_slf4j_slf4j_simple_2_0_0
128-
@maven//:org_yaml_snakeyaml_1_25
128+
@maven//:org_yaml_snakeyaml_2_2
129129
@maven//:org_zeroturnaround_zt_exec_1_10

dependencies/vaticle/repositories.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ def vaticle_dependencies():
88
git_repository(
99
name = "vaticle_dependencies",
1010
remote = "https://github.com/vaticle/dependencies",
11-
commit = "0a54a3551ef149346832d65a9c844429fff76f12", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
11+
commit = "729d960a92e145e03794395bbe59e02f122f1aee", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
1212
)
1313

1414
def vaticle_typedb_driver():
1515
git_repository(
1616
name = "vaticle_typedb_driver",
1717
remote = "https://github.com/vaticle/typedb-driver",
18-
tag = "2.28.0", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_driver
18+
tag = "2.28.2-rc1", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_driver
1919
)

test/assembly/AssemblyTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public void test_console_command() throws IOException, InterruptedException, Tim
2424
TypeDBConsoleRunner consoleRunner = new TypeDBConsoleRunner();
2525
Map<String, String> coreOptions = new HashMap<>();
2626
coreOptions.put("--diagnostics.reporting.errors", "false");
27+
coreOptions.put("--diagnostics.reporting.statistics", "false");
2728
coreOptions.put("--diagnostics.monitoring.enable", "false");
2829
TypeDBCoreRunner coreRunner = new TypeDBCoreRunner(coreOptions);
2930
try {

0 commit comments

Comments
 (0)