Skip to content

Commit 32c1de6

Browse files
Merge for 2.26.6-rc1 release (#233)
## Usage and product changes We merge development into master for 2.26.6-rc1 release.
2 parents 74e45a9 + 9660e2f commit 32c1de6

File tree

12 files changed

+132
-96
lines changed

12 files changed

+132
-96
lines changed

.circleci/config.yml

Lines changed: 29 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,6 @@ jobs:
146146
export DEPLOY_ARTIFACT_USERNAME=$REPO_TYPEDB_USERNAME
147147
export DEPLOY_ARTIFACT_PASSWORD=$REPO_TYPEDB_PASSWORD
148148
bazel run --define version=$(cat VERSION) //:deploy-linux-x86_64-targz --compilation_mode=opt -- release
149-
- run: |
150-
mkdir -p ~/dist
151-
cp bazel-bin/typedb-console-linux-x86_64.tar.gz ~/dist/typedb-console-linux-x86_64.tar.gz
152-
- persist_to_workspace:
153-
root: ~/dist
154-
paths: ["./*"]
155149
156150
deploy-artifact-release-linux-arm64:
157151
executor: linux-arm64-amazonlinux-2
@@ -163,13 +157,7 @@ jobs:
163157
export DEPLOY_ARTIFACT_USERNAME=$REPO_TYPEDB_USERNAME
164158
export DEPLOY_ARTIFACT_PASSWORD=$REPO_TYPEDB_PASSWORD
165159
bazel run --define version=$(cat VERSION) //:deploy-linux-arm64-targz --compilation_mode=opt -- release
166-
- run: |
167-
mkdir -p ~/dist
168-
cp bazel-bin/typedb-console-linux-arm64.tar.gz ~/dist/typedb-console-linux-arm64.tar.gz
169-
- persist_to_workspace:
170-
root: ~/dist
171-
paths: ["./*"]
172-
160+
173161
deploy-artifact-release-mac-x86_64:
174162
executor: mac-x86_64
175163
steps:
@@ -179,13 +167,7 @@ jobs:
179167
export DEPLOY_ARTIFACT_USERNAME=$REPO_TYPEDB_USERNAME
180168
export DEPLOY_ARTIFACT_PASSWORD=$REPO_TYPEDB_PASSWORD
181169
bazel run --define version=$(cat VERSION) //:deploy-mac-x86_64-zip --compilation_mode=opt -- release
182-
- run: |
183-
mkdir -p ~/dist
184-
cp bazel-bin/typedb-console-mac-x86_64.zip ~/dist/typedb-console-mac-x86_64.zip
185-
- persist_to_workspace:
186-
root: ~/dist
187-
paths: ["./*"]
188-
170+
189171
deploy-artifact-release-mac-arm64:
190172
executor: mac-arm64
191173
steps:
@@ -195,13 +177,7 @@ jobs:
195177
export DEPLOY_ARTIFACT_USERNAME=$REPO_TYPEDB_USERNAME
196178
export DEPLOY_ARTIFACT_PASSWORD=$REPO_TYPEDB_PASSWORD
197179
bazel run --define version=$(cat VERSION) //:deploy-mac-arm64-zip --compilation_mode=opt -- release
198-
- run: |
199-
mkdir -p ~/dist
200-
cp bazel-bin/typedb-console-mac-arm64.zip ~/dist/typedb-console-mac-arm64.zip
201-
- persist_to_workspace:
202-
root: ~/dist
203-
paths: [ "./*" ]
204-
180+
205181
deploy-artifact-release-windows-x86_64:
206182
executor:
207183
name: win/default
@@ -212,26 +188,31 @@ jobs:
212188
- checkout
213189
- run: .circleci\windows\prepare.bat
214190
- run: .circleci\windows\deploy_release.bat
215-
- persist_to_workspace:
216-
root: dist
217-
paths: [ "./*" ]
218191

219192
deploy-github:
220193
executor: linux-x86_64-ubuntu-2204
221194
steps:
222-
- attach_workspace:
223-
at: ~/dist
224195
- checkout
225196
- install-bazel-apt:
226197
arch: amd64
227198
- run:
228199
name: "Publish Release on GitHub"
229200
command: |
230-
wget https://github.com/tcnksm/ghr/releases/download/v0.12.1/ghr_v0.12.1_linux_amd64.tar.gz
231-
tar -xf ghr_v0.12.1_linux_amd64.tar.gz
232-
ghr_v0.12.1_linux_amd64/ghr -t ${REPO_GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} \
201+
wget https://github.com/tcnksm/ghr/releases/download/v0.16.2/ghr_v0.16.2_linux_amd64.tar.gz
202+
tar -xf ghr_v0.16.2_linux_amd64.tar.gz
203+
ghr_v0.16.2_linux_amd64/ghr -t ${REPO_GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} \
233204
-r ${CIRCLE_PROJECT_REPONAME} -n "TypeDB Console $(cat VERSION)" -b "$(cat ./RELEASE_NOTES_LATEST.md)" \
234-
-c ${CIRCLE_SHA1} -delete $(cat VERSION) ~/dist/
205+
-c ${CIRCLE_SHA1} -delete $(cat VERSION)
206+
207+
sync-dependencies:
208+
executor: linux-x86_64-ubuntu-2204
209+
steps:
210+
- checkout
211+
- install-bazel-apt:
212+
arch: amd64
213+
- run:
214+
export SYNC_DEPENDENCIES_TOKEN=$REPO_GITHUB_TOKEN
215+
bazel run @vaticle_dependencies//tool/sync:dependencies -- --source ${CIRCLE_PROJECT_REPONAME}@$(cat VERSION)
235216

236217
release-cleanup:
237218
executor: linux-x86_64-ubuntu-2204
@@ -249,23 +230,23 @@ workflows:
249230
- deploy-artifact-snapshot-linux-x86_64:
250231
filters:
251232
branches:
252-
only: [master]
233+
only: [master, development]
253234
- deploy-artifact-snapshot-linux-arm64:
254235
filters:
255236
branches:
256-
only: [master]
237+
only: [master, development]
257238
- deploy-artifact-snapshot-mac-x86_64:
258239
filters:
259240
branches:
260-
only: [master]
241+
only: [master, development]
261242
- deploy-artifact-snapshot-mac-arm64:
262243
filters:
263244
branches:
264-
only: [master]
245+
only: [master, development]
265246
- deploy-artifact-snapshot-windows-x86_64:
266247
filters:
267248
branches:
268-
only: [master]
249+
only: [master, development]
269250

270251
release:
271252
jobs:
@@ -299,9 +280,15 @@ workflows:
299280
- deploy-artifact-release-mac-x86_64
300281
- deploy-artifact-release-mac-arm64
301282
- deploy-artifact-release-windows-x86_64
302-
- release-cleanup:
283+
- sync-dependencies:
303284
filters:
304285
branches:
305286
only: [release]
306287
requires:
307288
- deploy-github
289+
- release-cleanup:
290+
filters:
291+
branches:
292+
only: [release]
293+
requires:
294+
- sync-dependencies

.circleci/windows/deploy_release.bat

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,3 @@ SET DEPLOY_ARTIFACT_PASSWORD=%REPO_TYPEDB_PASSWORD%
2727
SET /p VER=<VERSION
2828
bazel --output_user_root=C:/b run --verbose_failures --define version=%VER% //:deploy-windows-x86_64-zip --compilation_mode=opt -- release
2929
IF %errorlevel% NEQ 0 EXIT /b %errorlevel%
30-
31-
MD dist
32-
COPY bazel-bin\typedb-console-windows-x86_64.zip dist\typedb-console-windows-x86_64.zip

.factory/automation.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@ config:
1919
version-candidate: VERSION
2020
dependencies:
2121
dependencies: [build]
22-
typedb-common: [build, release]
2322
typedb-driver: [build, release]
2423

2524
build:
2625
quality:
2726
filter:
2827
owner: vaticle
29-
branch: master
28+
branch: [master, development]
3029
dependency-analysis:
3130
image: vaticle-ubuntu-22.04
3231
command: |
@@ -58,13 +57,22 @@ build:
5857
deploy-runner-maven-snapshot:
5958
filter:
6059
owner: vaticle
61-
branch: master
60+
branch: [master, development]
6261
image: vaticle-ubuntu-22.04
6362
dependencies: [build]
6463
command: |
6564
export DEPLOY_MAVEN_USERNAME=$REPO_TYPEDB_USERNAME
6665
export DEPLOY_MAVEN_PASSWORD=$REPO_TYPEDB_PASSWORD
6766
bazel run --define version=$(git rev-parse HEAD) //tool/runner:deploy-maven -- snapshot
67+
sync-dependencies:
68+
image: vaticle-ubuntu-22.04
69+
filter:
70+
owner: vaticle
71+
branch: [master, development]
72+
dependencies: [test-assembly]
73+
command: |
74+
export SYNC_DEPENDENCIES_TOKEN=$REPO_GITHUB_TOKEN
75+
bazel run @vaticle_dependencies//tool/sync:dependencies -- --source ${FACTORY_REPO}@${FACTORY_COMMIT}
6876
6977
release:
7078
filter:

BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ java_library(
5050
"@vaticle_typeql//java/common:common",
5151
"@vaticle_typeql//java/query",
5252
"@vaticle_typeql//java/pattern",
53-
"@vaticle_typedb_common//:common",
53+
"@vaticle_typeql//common/java:common",
5454

5555
# External dependencies
5656
"@maven//:com_google_code_findbugs_jsr305",
@@ -187,7 +187,6 @@ release_validate_deps(
187187
name = "release-validate-deps",
188188
refs = "@vaticle_typedb_console_workspace_refs//:refs.json",
189189
tagged_deps = [
190-
"@vaticle_typedb_common",
191190
"@vaticle_typedb_driver",
192191
"@vaticle_typeql",
193192
],
@@ -231,5 +230,6 @@ filegroup(
231230
"@vaticle_dependencies//tool/sonarcloud:code-analysis",
232231
"@vaticle_dependencies//tool/release/notes:create",
233232
"@vaticle_dependencies//tool/release/notes:validate",
233+
"@vaticle_dependencies//tool/sync:dependencies",
234234
],
235235
)

RELEASE_NOTES_LATEST.md

Lines changed: 73 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,87 @@
1+
## Distribution
2+
3+
Download from TypeDB Package Repository: https://cloudsmith.io/~typedb/repos/public-release/packages/?q=name:^typedb-console+version:2.26.6-rc1
14

2-
## New Features
35

6+
## New Features
7+
- **Allow unicode TypeQL variables**
8+
9+
We update to the latest TypeQL, which supports unicode variables. This means TypeDB Console can now use unicode variables, as well as labels and string attribute values.
10+
11+
For example, we can use Mandarin character sets:
12+
13+
```
14+
test::schema::write> define 人 sub entity;
15+
16+
Concepts have been defined
17+
18+
test::schema::write*> commit
19+
Transaction changes committed
20+
> transaction test data write
21+
test::data::write> insert $人 isa 人;
22+
23+
{ $人 iid 0x826e80017fffffffffffffff isa 人; }
24+
25+
answers: 1, total duration: 102 ms
26+
27+
test::data::write*> commit
28+
Transaction changes committed
29+
> transaction test data read
30+
test::data::read> match $人 isa 人; get;
31+
32+
{ $人 iid 0x826e80018000000000000000 isa 人; }
33+
34+
answers: 1, total duration: 54 ms
35+
```
36+
37+
38+
439

540
## Bugs Fixed
641

742

843
## Code Refactors
9-
- **Reconfigure CircleCI executors to use GLIBC 2.26**
44+
- **Use typedb-common from typeql/common, only deploy to CloudSmith**
45+
46+
We update Bazel dependencies and target paths following the merging of typedb-common into [vaticle/typeql](https://github.com/vaticle/typeql/) (see https://github.com/vaticle/typeql/pull/313).
1047

11-
We compile and release TypeDB Console using an older version of Linux, which requires GLIBC 2.26 instead of GLIBC 2.27. This change switches the build platform to Amazon Linux 2 (via Docker), which is based on CentOS, instead of Ubuntu 18.04, which is based on Debian.
48+
We also no longer upload build artifacts to the github releases page. Instead, the artifacts are available from our public cloudsmith repository, linked in the release notes.
1249

13-
Additionally, we upgrade the Windows Orb to 5.0.0, which also allowed using a larger executor to reduce CI time.
1450

51+
- **Bring in launch binary and console runner library from common**
52+
53+
We move the `binary` package and `console-runner` into this repository from typedb-common. `typedb-console-runner` is deployed to maven such that we can safely depend on it from other repos without creating Bazel dependency cycles.
1554

1655

1756
## Other Improvements
18-
- **Shorten diagnostic ID to 16 hex chars**
57+
- **Explicitly install python tool dependencies**
58+
59+
Since the upgrade to rules-python v0.24 (https://github.com/vaticle/dependencies/pull/460), we are required to explicitly install python dependencies in the WORKSPACE file. The python tools happened to be unused, so these errors were not visible until the sync dependencies tool was restored.
60+
61+
- **Sync dependencies in CI**
62+
63+
We add a sync-dependencies job to be run in CI after successful snapshot and release deployments. The job sends a request to vaticle-bot to update all downstream dependencies.
64+
65+
Note: this PR does _not_ update the `dependencies` repo dependency. It will be updated automatically by the bot during its first pass.
66+
67+
- **Only submit uncaught exceptions to diagnostics**
68+
69+
- **Set up CI filters for master-development workflow**
70+
71+
- **Make console runner use the same java installation as the calling process**
72+
Makes TypeDB console runner use the same java installation as the calling process, so the system remain hermetic.
73+
74+
- **Fix CI file and disable Core diagnostics in test**
75+
76+
- **Migrate artifact hosting to cloudsmith**
77+
Updates artifact credentials, and deployment & consumption rules to use cloudsmith (repo.typedb.com) instead of the self-hosted sonatype repository (repo.vaticle.com).
78+
79+
- **Remove typedb-console-runner's dependency on typedb-common**
80+
81+
We remove `typedb-console-runner`'s dependency on common in order to reduce deployment complexity and make the maven library self-contained.
82+
83+
- **Force hermitic JDK for builds**
84+
85+
- **Fix install-bazel-apt typo**
1986

87+

RELEASE_TEMPLATE.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1+
## Distribution
2+
3+
Download from TypeDB Package Repository: https://cloudsmith.io/~typedb/repos/public-release/packages/?q=name:^typedb-console+version:{version}
4+
15
{ release notes }

TypeDBConsole.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,12 @@ private static void configureAndVerifyJavaVersion() {
156156
}
157157
}
158158

159+
/**
160+
* We initialise diagnostics in the default set-up which will only report uncaught exceptions.
161+
*/
159162
private static void configureDiagnostics(boolean diagnosticsDisabled) {
160163
Sentry.init(options -> {
161164
options.setDsn(DIAGNOSTICS_REPORTING_URI);
162-
options.setEnableTracing(true);
163165
options.setSendDefaultPii(false);
164166
options.setRelease(releaseName());
165167
if (!diagnosticsDisabled) options.setEnabled(true);
@@ -283,7 +285,6 @@ private void runREPLMode(CLIOptions options) {
283285
}
284286
} catch (TypeDBDriverException e) {
285287
printer.error(e.getMessage());
286-
Sentry.captureException(e);
287288
} finally {
288289
executorService.shutdownNow();
289290
}
@@ -387,7 +388,6 @@ private boolean transactionREPL(TypeDBDriver driver, boolean isCloud, String dat
387388
}
388389
} catch (TypeDBDriverException e) {
389390
printer.error(e.getMessage());
390-
Sentry.captureException(e);
391391
}
392392
return false;
393393
}
@@ -490,7 +490,6 @@ private boolean runInlineCommandMode(CLIOptions options, List<String> inlineComm
490490
}
491491
} catch (TypeDBDriverException e) {
492492
printer.error(e.getMessage());
493-
Sentry.captureException(e);
494493
return false;
495494
} finally {
496495
executorService.shutdownNow();

VERSION

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

0 commit comments

Comments
 (0)