Skip to content

Commit 3e63a44

Browse files
farostfarost
committed
Remove windows deps and update automations
1 parent ec1165c commit 3e63a44

File tree

7 files changed

+57
-49
lines changed

7 files changed

+57
-49
lines changed

‎.circleci/config.yml‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -199,15 +199,16 @@ jobs:
199199
-r ${CIRCLE_PROJECT_REPONAME} -n "TypeDB Console $(cat VERSION)" -b "$(cat ./RELEASE_NOTES_LATEST.md)" \
200200
-c ${CIRCLE_SHA1} -delete $(cat VERSION)
201201
202-
sync-dependencies:
203-
executor: linux-x86_64-ubuntu-2204
204-
steps:
205-
- checkout
206-
- install-bazel-apt:
207-
arch: amd64
208-
- run: |
209-
export SYNC_DEPENDENCIES_TOKEN=$REPO_GITHUB_TOKEN
210-
bazel run @typedb_dependencies//tool/sync:dependencies -- --source ${CIRCLE_PROJECT_REPONAME}@$(cat VERSION)
202+
# TODO: Return deps
203+
# sync-dependencies:
204+
# executor: linux-x86_64-ubuntu-2204
205+
# steps:
206+
# - checkout
207+
# - install-bazel-apt:
208+
# arch: amd64
209+
# - run: |
210+
# export SYNC_DEPENDENCIES_TOKEN=$REPO_GITHUB_TOKEN
211+
# bazel run @typedb_dependencies//tool/sync:dependencies -- --source ${CIRCLE_PROJECT_REPONAME}@$(cat VERSION)
211212

212213
release-cleanup:
213214
executor: linux-x86_64-ubuntu-2204
@@ -225,23 +226,23 @@ workflows:
225226
- deploy-artifact-snapshot-linux-x86_64:
226227
filters:
227228
branches:
228-
only: [master, development, "3.0"]
229+
only: [master, cluster-support-feature-branch]
229230
- deploy-artifact-snapshot-linux-arm64:
230231
filters:
231232
branches:
232-
only: [master, development, "3.0"]
233+
only: [master, cluster-support-feature-branch]
233234
- deploy-artifact-snapshot-mac-x86_64:
234235
filters:
235236
branches:
236-
only: [master, development, "3.0"]
237+
only: [master, cluster-support-feature-branch]
237238
- deploy-artifact-snapshot-mac-arm64:
238239
filters:
239240
branches:
240-
only: [master, development, "3.0"]
241+
only: [master, cluster-support-feature-branch]
241242
- deploy-artifact-snapshot-windows-x86_64:
242243
filters:
243244
branches:
244-
only: [master, development, "3.0"]
245+
only: [master, cluster-support-feature-branch]
245246

246247
release:
247248
jobs:
@@ -275,15 +276,15 @@ workflows:
275276
- deploy-artifact-release-mac-x86_64
276277
- deploy-artifact-release-mac-arm64
277278
- deploy-artifact-release-windows-x86_64
278-
- sync-dependencies:
279-
filters:
280-
branches:
281-
only: [release]
282-
requires:
283-
- deploy-github
279+
# - sync-dependencies:
280+
# filters:
281+
# branches:
282+
# only: [release]
283+
# requires:
284+
# - deploy-github
284285
- release-cleanup:
285286
filters:
286287
branches:
287288
only: [release]
288-
requires:
289-
- sync-dependencies
289+
# requires:
290+
# - sync-dependencies

‎.factory/automation.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ build:
1212
quality:
1313
filter:
1414
owner: typedb
15-
branch: [master]
15+
branch: [master, cluster-support-feature-branch]
1616
dependency-analysis:
1717
image: typedb-ubuntu-22.04
1818
command: |
@@ -58,7 +58,7 @@ build:
5858
release:
5959
filter:
6060
owner: typedb
61-
branch: [master]
61+
branch: [master, cluster-support-feature-branch]
6262
validation:
6363
validate-dependencies:
6464
image: typedb-ubuntu-22.04

‎src/cli.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ pub struct Args {
3838
#[arg(long, value_name = "public=private,...", conflicts_with_all = ["address", "addresses"])]
3939
pub address_translation: Option<String>,
4040

41-
/// If used in a Cluster environment (Cloud or Enterprise), disables attempts to redirect
42-
/// requests to server replicas, limiting Console to communicate only with the single address
41+
/// If used in a Cluster environment (Cloud or Enterprise), disables attempts to redirect
42+
/// requests to server replicas, limiting Console to communicate only with the single address
4343
/// specified in the `address` argument.
4444
/// Use for administrative / debug purposes to test a specific replica only: this option will
4545
/// lower the success rate of Console's operations in production.

‎src/main.rs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ use crate::{
3232
database_create, database_create_init, database_delete, database_export, database_import, database_list,
3333
database_schema, replica_deregister, replica_list, replica_primary, replica_register, server_version,
3434
transaction_close, transaction_commit, transaction_query, transaction_read, transaction_rollback,
35-
transaction_schema, transaction_source, transaction_write, user_create, user_delete,
36-
user_list, user_update_password,
35+
transaction_schema, transaction_source, transaction_write, user_create, user_delete, user_list,
36+
user_update_password,
3737
},
3838
repl::{
3939
command::{get_word, parse_one_query, CommandInput, CommandLeaf, Subcommand},
@@ -173,8 +173,11 @@ fn main() {
173173
Err(err) => {
174174
let tls_error =
175175
if args.tls_disabled { "" } else { "\nVerify that the server is also configured with TLS encryption." };
176-
let replication_error =
177-
if args.replication_disabled { "\nVerify that the connection address is **exactly** the same as the server address specified in its config." } else { "" };
176+
let replication_error = if args.replication_disabled {
177+
"\nVerify that the connection address is **exactly** the same as the server address specified in its config."
178+
} else {
179+
""
180+
};
178181
println_error!("Failed to create driver connection to server. {err}{tls_error}{replication_error}");
179182
exit(ExitCode::ConnectionError as i32);
180183
}

‎src/operations.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
use std::{error::Error, fs::read_to_string, path::PathBuf, process::exit, rc::Rc};
88

99
use futures::stream::StreamExt;
10+
use itertools::Itertools;
1011
use sha2::Digest;
1112
use typedb_driver::{
1213
answer::{QueryAnswer, QueryType},
1314
TransactionOptions, TransactionType,
1415
};
1516
use ureq;
16-
use itertools::Itertools;
1717

1818
use crate::{
1919
constants::DEFAULT_TRANSACTION_TIMEOUT,

‎tests/assembly/BUILD‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ rust_test(
3232
"TYPEDB_CONSOLE_ARCHIVE": "$(rootpath //:assemble-mac-arm64-zip)",
3333
"TYPEDB_SERVER_ARCHIVE": "$(rootpath @typedb_artifact_mac-arm64//file)",
3434
},
35-
"@typedb_bazel_distribution//platform:is_windows_x86_64" : {
36-
"TYPEDB_CONSOLE_ARCHIVE": "$(rootpath //:assemble-windows-x86_64-zip)",
37-
"TYPEDB_SERVER_ARCHIVE": "$(rootpath @typedb_artifact_windows-x86_64//file)",
38-
},
35+
# TODO: Return windows
36+
# "@typedb_bazel_distribution//platform:is_windows_x86_64" : {
37+
# "TYPEDB_CONSOLE_ARCHIVE": "$(rootpath //:assemble-windows-x86_64-zip)",
38+
# "TYPEDB_SERVER_ARCHIVE": "$(rootpath @typedb_artifact_windows-x86_64//file)",
39+
# },
3940
}),
4041
data = select({
4142
"@typedb_bazel_distribution//platform:is_linux_x86_64": [
@@ -54,10 +55,11 @@ rust_test(
5455
"//:assemble-mac-arm64-zip",
5556
"@typedb_artifact_mac-arm64//file",
5657
],
57-
"@typedb_bazel_distribution//platform:is_windows_x86_64" : [
58-
"//:assemble-windows-x86_64-zip",
59-
"@typedb_artifact_windows-x86_64//file",
60-
],
58+
# TODO: Return Windows
59+
# "@typedb_bazel_distribution//platform:is_windows_x86_64" : [
60+
# "//:assemble-windows-x86_64-zip",
61+
# "@typedb_artifact_windows-x86_64//file",
62+
# ],
6163
}),
6264
use_libtest_harness = True,
6365
)
@@ -92,11 +94,12 @@ rust_test(
9294
"TYPEDB_SERVER_ARCHIVE": "$(rootpath @typedb_artifact_mac-arm64//file)",
9395
"SCRIPT_PATH": "$(rootpath script.tqls)",
9496
},
95-
"@typedb_bazel_distribution//platform:is_windows_x86_64" : {
96-
"TYPEDB_CONSOLE_ARCHIVE": "$(rootpath //:assemble-windows-x86_64-zip)",
97-
"TYPEDB_SERVER_ARCHIVE": "$(rootpath @typedb_artifact_windows-x86_64//file)",
98-
"SCRIPT_PATH": "$(rootpath script.tqls)",
99-
},
97+
# TODO: Return Windows
98+
# "@typedb_bazel_distribution//platform:is_windows_x86_64" : {
99+
# "TYPEDB_CONSOLE_ARCHIVE": "$(rootpath //:assemble-windows-x86_64-zip)",
100+
# "TYPEDB_SERVER_ARCHIVE": "$(rootpath @typedb_artifact_windows-x86_64//file)",
101+
# "SCRIPT_PATH": "$(rootpath script.tqls)",
102+
# },
100103
}),
101104
data = ["script.tqls", "attributes.tql", "entities.tql"]
102105
+ select({
@@ -116,10 +119,11 @@ rust_test(
116119
"//:assemble-mac-arm64-zip",
117120
"@typedb_artifact_mac-arm64//file",
118121
],
119-
"@typedb_bazel_distribution//platform:is_windows_x86_64" : [
120-
"//:assemble-windows-x86_64-zip",
121-
"@typedb_artifact_windows-x86_64//file",
122-
],
122+
# TODO: Return Windows
123+
# "@typedb_bazel_distribution//platform:is_windows_x86_64" : [
124+
# "//:assemble-windows-x86_64-zip",
125+
# "@typedb_artifact_windows-x86_64//file",
126+
# ],
123127
}),
124128
use_libtest_harness = True,
125129
)

‎tests/assembly/test_assembly.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ fn run_typedb_server() -> (TypeDBBinaryRunner, Child) {
5454
let runner = TypeDBBinaryRunner::new(TYPEDB_SERVER_ARCHIVE_VAR, TYPEDB_SERVER_SUBCOMMAND)
5555
.expect("Failed to create server binary runner");
5656
// note: run in development mode to avoid polluting analytics data when using tagged releases
57-
let args = ["--server.address", "0.0.0.0:1729", "--development-mode.enabled", "true" ];
57+
let args = ["--server.address", "0.0.0.0:1729", "--development-mode.enabled", "true"];
5858
let child: io::Result<Child> = runner.run(&args);
5959
(runner, child.expect("Failed to spawn child server process."))
6060
}

0 commit comments

Comments
 (0)