Skip to content

Commit db18f9f

Browse files
Merge for 2.26.6-rc0 release (#197)
## Release notes: usage and product changes We merge development into master for 2.26.6-rc0 release.
2 parents a1ebf01 + 3644955 commit db18f9f

File tree

6 files changed

+56
-14
lines changed

6 files changed

+56
-14
lines changed

.factory/automation.yml

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,12 @@ build:
3131
bazel run @vaticle_dependencies//factory/analysis:dependency-analysis
3232
correctness:
3333
build:
34-
# TODO: use default machine once we delete the non-Rust protocols
35-
machine: 4-core-16-gb
3634
image: vaticle-ubuntu-22.04
37-
#NPM packages can't be built under RBE
3835
command: |
3936
bazel build //...
4037
bazel run @vaticle_dependencies//tool/checkstyle:test-coverage
4138
bazel test $(bazel query 'kind(checkstyle_test, //...)') --test_output=errors
4239
build-dependency:
43-
# TODO: use default machine once we delete the non-Rust protocols
44-
machine: 4-core-16-gb
4540
image: vaticle-ubuntu-22.04
4641
command: |
4742
dependencies/maven/update.sh
@@ -50,7 +45,7 @@ build:
5045
deploy-crate-snapshot:
5146
filter:
5247
owner: vaticle
53-
branch: master
48+
branch: [master, development]
5449
dependencies: [build, build-dependency]
5550
image: vaticle-ubuntu-22.04
5651
command: |
@@ -59,13 +54,26 @@ build:
5954
deploy-npm-snapshot:
6055
filter:
6156
owner: vaticle
62-
branch: master
57+
branch: [master, development]
6358
dependencies: [build, build-dependency]
6459
image: vaticle-ubuntu-20.04
6560
command: |
6661
export DEPLOY_NPM_USERNAME=$REPO_TYPEDB_USERNAME
6762
export DEPLOY_NPM_PASSWORD=$REPO_TYPEDB_PASSWORD
6863
bazel run --define version=$(git rev-parse HEAD) //grpc/nodejs:deploy-npm -- snapshot
64+
sync-dependencies:
65+
image: vaticle-ubuntu-22.04
66+
filter:
67+
owner: vaticle
68+
branch: [master, development]
69+
dependencies:
70+
- build
71+
- build-dependency
72+
- deploy-crate-snapshot
73+
- deploy-npm-snapshot
74+
command: |
75+
export SYNC_DEPENDENCIES_TOKEN=$REPO_GITHUB_TOKEN
76+
bazel run @vaticle_dependencies//tool/sync:dependencies -- --source ${FACTORY_REPO}@${FACTORY_COMMIT}
6977
7078
release:
7179
filter:
@@ -106,3 +114,15 @@ release:
106114
sudo apt install -y expect
107115
export DEPLOY_NPM_TOKEN=$REPO_NPM_TOKEN
108116
bazel run --define version=$(cat VERSION) //grpc/nodejs:deploy-npm -- release
117+
sync-dependencies-release:
118+
image: vaticle-ubuntu-22.04
119+
filter:
120+
owner: vaticle
121+
branch: [master, development]
122+
dependencies:
123+
- deploy-github
124+
- deploy-crate-release
125+
- deploy-npm-release
126+
command: |
127+
export SYNC_DEPENDENCIES_TOKEN=$REPO_GITHUB_TOKEN
128+
bazel run @vaticle_dependencies//tool/sync:dependencies -- --source ${FACTORY_REPO}@$(cat VERSION)

BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,6 @@ filegroup(
6363
"@vaticle_dependencies//tool/ide:rust_sync",
6464
"@vaticle_dependencies//tool/unuseddeps:unused-deps",
6565
"@vaticle_dependencies//tool/release/notes:create",
66+
"@vaticle_dependencies//tool/sync:dependencies",
6667
],
6768
)

RELEASE_NOTES_LATEST.md

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ Documentation: https://typedb.com/docs/clients/2.x/clients
77
Available from https://crates.io/crates/typedb-protocol
88

99
```sh
10-
cargo add typedb-protocol@2.25.2
10+
cargo add typedb-protocol@2.26.6-rc0
1111
```
1212

1313
#### For Node.js through npm
1414

1515
Available from https://www.npmjs.com/package/typedb-protocol
1616

1717
```sh
18-
npm install typedb-protocol@2.25.2
18+
npm install typedb-protocol@2.26.6-rc0
1919
```
2020
or
2121
```sh
22-
yarn add typedb-protocol@2.25.2
22+
yarn add typedb-protocol@2.26.6-rc0
2323
```
2424

2525

@@ -33,6 +33,26 @@ yarn add typedb-protocol@2.25.2
3333

3434

3535
## Other Improvements
36+
- **Explicitly install python tool dependencies**
37+
38+
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.
39+
40+
- **Sync dependencies in CI**
41+
42+
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.
43+
44+
Note: this PR does _not_ update the `dependencies` repo dependency. It will be updated automatically by the bot during its first pass.
45+
46+
- **Set up CI filters for master-development workflow**
47+
48+
- **Migrate artifact hosting to cloudsmith**
49+
Updates artifact deployment & consumption rules to use cloudsmith instead of the self-hosted sonatype repository.
50+
51+
52+
- **Update grpc dependency labels**
53+
54+
We update all references to `@vaticle_dependencies//builder/grpc` to refer to `@vaticle_dependencies//builder/proto_grpc` instead. See https://github.com/vaticle/dependencies/pull/492.
55+
56+
- **Simplify github templates**
3657

37-
- **Update build dependencies**
3858

VERSION

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

WORKSPACE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ crate_repositories()
6666
# Load //tool/common
6767
load("@vaticle_dependencies//tool/common:deps.bzl", "vaticle_dependencies_ci_pip", vaticle_dependencies_tool_maven_artifacts = "maven_artifacts")
6868
vaticle_dependencies_ci_pip()
69+
load("@vaticle_dependencies_ci_pip//:requirements.bzl", "install_deps")
70+
install_deps()
6971

7072
# Load //builder/proto_grpc
7173
load("@vaticle_dependencies//builder/proto_grpc:deps.bzl", vaticle_grpc_deps = "deps")

dependencies/vaticle/repositories.bzl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@ def vaticle_dependencies():
2121
git_repository(
2222
name = "vaticle_dependencies",
2323
remote = "https://github.com/vaticle/dependencies",
24-
commit = "9632621e9e6381e192ba744ccb3f7447d0433c19", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
24+
commit = "cd00aa9bc16bc2eb857b9b5e4d7a301bf19908dc", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
2525
)
26-

0 commit comments

Comments
 (0)