Skip to content

Commit 60c686a

Browse files
jessfrazgraphite-app[bot]github-advanced-security[bot]
authored
windows ca smoke test and some other updates (#1344)
* windows ca smoke test Signed-off-by: Jessie Frazelle <[email protected]> * updates large project Signed-off-by: Jessie Frazelle <[email protected]> * clippy Signed-off-by: Jessie Frazelle <[email protected]> * Update src/cmd_ml/cmd_kcl.rs Co-authored-by: graphite-app[bot] <96075541+graphite-app[bot]@users.noreply.github.com> * updates Signed-off-by: Jessie Frazelle <[email protected]> * updates Signed-off-by: Jessie Frazelle <[email protected]> * debug Signed-off-by: Jessie Frazelle <[email protected]> * updates Signed-off-by: Jessie Frazelle <[email protected]> * use gh action Signed-off-by: Jessie Frazelle <[email protected]> * Potential fix for code scanning alert no. 29: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * use gh action Signed-off-by: Jessie Frazelle <[email protected]> * empty * empty Signed-off-by: Jessie Frazelle <[email protected]> * updates Signed-off-by: Jessie Frazelle <[email protected]> * Potential fix for code scanning alert no. 30: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * updates Signed-off-by: Jessie Frazelle <[email protected]> * allow slash command for forcing tools Signed-off-by: Jessie Frazelle <[email protected]> * fix winca Signed-off-by: Jessie Frazelle <[email protected]> * ca smoke Signed-off-by: Jessie Frazelle <[email protected]> * updates Signed-off-by: Jessie Frazelle <[email protected]> * updates Signed-off-by: Jessie Frazelle <[email protected]> * updates Signed-off-by: Jessie Frazelle <[email protected]> * updates Signed-off-by: Jessie Frazelle <[email protected]> * updates Signed-off-by: Jessie Frazelle <[email protected]> * updates Signed-off-by: Jessie Frazelle <[email protected]> * updates Signed-off-by: Jessie Frazelle <[email protected]> * Potential fix for code scanning alert no. 32: Workflow does not contain permissions Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> * updates Signed-off-by: Jessie Frazelle <[email protected]> * updates Signed-off-by: Jessie Frazelle <[email protected]> * updates Signed-off-by: Jessie Frazelle <[email protected]> * updates Signed-off-by: Jessie Frazelle <[email protected]> * bump version Signed-off-by: Jessie Frazelle <[email protected]> --------- Signed-off-by: Jessie Frazelle <[email protected]> Co-authored-by: graphite-app[bot] <96075541+graphite-app[bot]@users.noreply.github.com> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
1 parent 9f02b28 commit 60c686a

28 files changed

+954
-239
lines changed

‎.github/workflows/win-ca-smoke.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: win-ca-smoke
2+
permissions:
3+
contents: read
4+
on:
5+
pull_request:
6+
push:
7+
branches: [main, master]
8+
jobs:
9+
smoke:
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
node: [20, 22]
14+
uses: kittycad/gh-action-win-ca/.github/workflows/win-ca-smoke.yml@main
15+
with:
16+
node-version: ${{ matrix.node }}
17+
setup-rust: true
18+
pre-test-command: cargo test --test win_ca_smoke -- --nocapture
19+
post-test-command: cargo test --test win_ca_smoke -- --nocapture
20+
pre-step-extra-env: '{"RUST_BACKTRACE":"1","SMOKE_URL":"https://127.0.0.1:4443/"}'
21+
post-step-extra-env: '{"RUST_BACKTRACE":"1","SMOKE_URL":"https://127.0.0.1:4443/"}'
22+
secrets:
23+
ZOO_TOKEN: ${{ secrets.KITTYCAD_TOKEN }}

‎Cargo.lock‎

Lines changed: 81 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "zoo"
3-
version = "0.2.122"
3+
version = "0.2.123"
44
edition = "2021"
55
build = "build.rs"
66

@@ -32,25 +32,24 @@ futures = "0.3"
3232
git_rev = "0.1.0"
3333
heck = "0.5.0"
3434
http = "1"
35+
image = { version = "0.25", default-features = false, features = [
36+
"png",
37+
"jpeg",
38+
] }
3539
itertools = "0.12.1"
36-
kcl-derive-docs = { version = "=0.1.97" }
37-
kcl-lib = { version = "=0.2.97", features = ["disable-println"] }
38-
kcl-test-server = "=0.1.97"
39-
kittycad = { version = "0.3.46", features = [
40+
kcl-lib = { version = "=0.2.100", features = ["disable-println"] }
41+
kcl-test-server = "=0.1.100"
42+
kittycad = { version = "0.4.2", features = [
4043
"clap",
4144
"tabled",
4245
"requests",
4346
"retry",
4447
] }
45-
kittycad-modeling-cmds = { version = "=0.2.137", features = [
48+
kittycad-modeling-cmds = { version = "=0.2.144", features = [
4649
"websocket",
4750
"convert_client_crate",
4851
"tabled",
4952
] }
50-
image = { version = "0.25", default-features = false, features = [
51-
"png",
52-
"jpeg",
53-
] }
5453
log = "0.4.27"
5554
miette = { version = "7.5.0", features = ["fancy"] }
5655
nu-ansi-term = "0.50.1"
@@ -67,6 +66,10 @@ regex = "1"
6766
reqwest = { version = "0.12", default-features = false, features = [
6867
"json",
6968
"rustls-tls",
69+
"rustls-tls-native-roots",
70+
"gzip",
71+
"brotli",
72+
"deflate",
7073
] }
7174
ring = "0.17.14"
7275
serde = { version = "1", features = ["derive"] }
@@ -81,6 +84,7 @@ slog-stdlog = "4"
8184
slog-term = "2"
8285
tabled = { version = "0.18.0", features = ["ansi"] }
8386
tabwriter = "1.4.1"
87+
tempfile = "3.19.1"
8488
terminal_size = "0.4.2"
8589
thiserror = "2"
8690
tokio = { version = "1", features = ["full"] }
@@ -92,7 +96,6 @@ url = "2.5.4"
9296
uuid = { version = "1.18.1", features = ["serde", "v4"] }
9397
version-compare = "0.2.0"
9498
viuer = { version = "0.9.1", features = ["print-file"] }
95-
tempfile = "3.19.1"
9699

97100
[build-dependencies]
98101
built = "0.7"

‎cli-macro-impl/src/lib.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ impl Operation {
254254
if e.to_string().contains("reference") {
255255
schema.get_schema_from_reference(&self.spec, false)?
256256
} else {
257-
anyhow::bail!("could not get schema from request body: {}", e);
257+
anyhow::bail!("could not get schema from request body: {e}");
258258
}
259259
}
260260
};
@@ -273,7 +273,7 @@ impl Operation {
273273
if e.to_string().contains("reference") {
274274
prop.get_schema_from_reference(&self.spec, false)?
275275
} else {
276-
anyhow::bail!("could not get schema from prop `{}`: {}", key, e);
276+
anyhow::bail!("could not get schema from prop `{key}`: {e}");
277277
}
278278
}
279279
};
@@ -1265,7 +1265,7 @@ impl Operation {
12651265

12661266
let fix = t.rendered()?.replace("crate::types::", "kittycad::types::");
12671267

1268-
fix.parse().map_err(|err| anyhow::anyhow!("{}", err))
1268+
fix.parse().map_err(|err| anyhow::anyhow!("{err}"))
12691269
}
12701270

12711271
fn get_is_check_fn(

‎src/cmd_alias.rs‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ impl crate::cmd::Command for CmdAliasDelete {
4848

4949
let (expansion, ok) = alias_config.get(&self.alias);
5050
if !ok {
51-
bail!("no such alias {}", self.alias);
51+
let alias = &self.alias;
52+
bail!("no such alias {alias}");
5253
}
5354

5455
match alias_config.delete(&self.alias) {
@@ -63,7 +64,8 @@ impl crate::cmd::Command for CmdAliasDelete {
6364
)?;
6465
}
6566
Err(e) => {
66-
bail!("failed to delete alias {}: {}", self.alias, e);
67+
let alias = &self.alias;
68+
bail!("failed to delete alias {alias}: {e}");
6769
}
6870
}
6971

@@ -119,14 +121,12 @@ impl crate::cmd::Command for CmdAliasSet {
119121

120122
// Check if already exists.
121123
if valid_command(&self.alias) {
122-
bail!("could not create alias: {} is already a zoo command", self.alias);
124+
let alias = &self.alias;
125+
bail!("could not create alias: {alias} is already a zoo command");
123126
}
124127

125128
if !is_shell && !valid_command(&expansion) {
126-
bail!(
127-
"could not create alias: {} does not correspond to a zoo command",
128-
expansion
129-
);
129+
bail!("could not create alias: {expansion} does not correspond to a zoo command");
130130
}
131131

132132
writeln!(
@@ -153,12 +153,13 @@ impl crate::cmd::Command for CmdAliasSet {
153153
writeln!(ctx.io.out, "{success_msg}")?;
154154
}
155155
Err(e) => {
156-
bail!("could not create alias: {}", e);
156+
bail!("could not create alias: {e}");
157157
}
158158
}
159159
}
160160
Err(e) => {
161-
bail!("failed to parse expansion {}: {}", self.expansion, e);
161+
let expansion = &self.expansion;
162+
bail!("failed to parse expansion {expansion}: {e}");
162163
}
163164
}
164165

0 commit comments

Comments
 (0)