Skip to content

Commit 50cf6d3

Browse files
brianheinemanbrianheineman
authored
Merge branch 'bencherdev:main' into main
2 parents 0ba773e + 6667f1a commit 50cf6d3

File tree

253 files changed

+2966
-353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

253 files changed

+2966
-353
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"MOLD_DEFAULT": "true",
77
"RUST_VERSION": "1.82.0",
88
"LITESTREAM_VERSION": "0.3.13",
9-
"LITESTREAM_ARCH": "amd64"
9+
"LITESTREAM_ARCH": "${localEnv:ARCH:amd64}"
1010
}
1111
},
1212
"postCreateCommand": "./.devcontainer/scripts/setup.sh",
@@ -22,6 +22,13 @@
2222
61016
2323
],
2424
"customizations": {
25+
"jetbrains": {
26+
"settings": {
27+
"com.intellij:app:HttpConfigurable.use_proxy_pac": true,
28+
"com.intellij:app:BaseRefactoringSettings.safe_delete_when_delete": false,
29+
"com.intellij:app:BaseRefactoringSettings.move_search_for_references_for_file": false
30+
}
31+
},
2532
"vscode": {
2633
"extensions": [
2734
"astro-build.astro-vscode",

‎.github/workflows/bencher.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,19 @@ jobs:
396396
mold-version: ${{ env.MOLD_VERSION }}
397397
- run: cargo audit
398398

399+
# Cargo Deny
400+
cargo_deny:
401+
name: Cargo Deny
402+
runs-on: ubuntu-22.04
403+
continue-on-error: true
404+
steps:
405+
- uses: actions/checkout@v4
406+
- uses: EmbarkStudios/cargo-deny-action@v2
407+
with:
408+
log-level: warn
409+
command: check
410+
arguments: --all-features
411+
399412
# Cargo Unused Deps
400413
cargo_udeps:
401414
name: Cargo Unused Deps
@@ -845,6 +858,7 @@ jobs:
845858
- npx_biome_format
846859
- npx_biome_lint
847860
- check_generated
861+
- cargo_deny
848862
# Test
849863
- cargo_test
850864
- api_smoke_test
@@ -905,6 +919,8 @@ jobs:
905919
run: flyctl deploy --local-only --config fly/fly.toml --wait-timeout 300
906920
- name: Rebase main on cloud
907921
run: |
922+
git config --global user.name "Bencher"
923+
git config --global user.email "[email protected]"
908924
git fetch origin cloud
909925
git checkout cloud
910926
git pull
@@ -996,6 +1012,7 @@ jobs:
9961012
- npx_biome_format
9971013
- npx_biome_lint
9981014
- check_generated
1015+
- cargo_deny
9991016
# Test
10001017
- cargo_test
10011018
- api_smoke_test

‎Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ exclude = ["services/benchers", "services/cargo-bencher"]
1111
resolver = "2"
1212

1313
[workspace.package]
14+
license = "LicenseRef-Bencher"
1415
version = "0.4.34"
1516
authors = ["Everett Pompeii <[email protected]>"]
1617
edition = "2021"

‎deny.toml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# Documentation for this configuration file can be found here
2+
# https://embarkstudios.github.io/cargo-deny/checks/cfg.html
3+
4+
[graph]
5+
targets = [
6+
{ triple = "aarch64-unknown-linux-gnu" },
7+
{ triple = "aarch64-unknown-linux-musl" },
8+
{ triple = "aarch64-apple-darwin" },
9+
{ triple = "x86_64-apple-darwin" },
10+
{ triple = "x86_64-pc-windows-msvc" },
11+
{ triple = "x86_64-unknown-linux-gnu" },
12+
{ triple = "x86_64-unknown-linux-musl" },
13+
]
14+
15+
[advisories]
16+
ignore = [
17+
"RUSTSEC-2024-0370",
18+
"RUSTSEC-2024-0384",
19+
"RUSTSEC-2024-0399",
20+
"RUSTSEC-2024-0402",
21+
"RUSTSEC-2024-0421",
22+
"RUSTSEC-2025-0004",
23+
]
24+
25+
# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
26+
[licenses]
27+
allow = [
28+
"Apache-2.0",
29+
"BSD-2-Clause",
30+
"BSD-3-Clause",
31+
"BSL-1.0",
32+
"CC0-1.0",
33+
"ISC",
34+
"LicenseRef-Bencher",
35+
"MIT",
36+
"MPL-2.0",
37+
"OpenSSL",
38+
"Unicode-DFS-2016",
39+
"Zlib",
40+
]
41+
42+
[[licenses.clarify]]
43+
name = "ring"
44+
expression = "MIT AND ISC AND OpenSSL"
45+
license-files = [
46+
{ path = "LICENSE", hash = 0xbd0eed23 }
47+
]
48+
49+
# https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html
50+
[bans]
51+
multiple-versions = "deny"
52+
wildcards = "allow"
53+
deny = []

‎lib/bencher_adapter/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[package]
22
name = "bencher_adapter"
3+
license.workspace = true
34
version.workspace = true
45
authors.workspace = true
56
edition.workspace = true

‎lib/bencher_boundary/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[package]
22
name = "bencher_boundary"
3+
license.workspace = true
34
version.workspace = true
45
authors.workspace = true
56
edition.workspace = true

‎lib/bencher_client/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[package]
22
name = "bencher_client"
3+
license.workspace = true
34
version.workspace = true
45
authors.workspace = true
56
edition.workspace = true

‎lib/bencher_comment/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[package]
22
name = "bencher_comment"
3+
license.workspace = true
34
version.workspace = true
45
authors.workspace = true
56
edition.workspace = true

‎lib/bencher_comment/src/lib.rs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,14 @@ fn value_cell(
811811
};
812812
let plus = if percent > 0.0.into() { "+" } else { "" };
813813
let percent = Units::format_float(percent.into());
814-
cell.push_str(&format!("<br />({plus}{percent}%)"));
814+
let baseline = Units::format_float((baseline / factor).into());
815+
cell.push_str("<br />");
816+
cell.push_str("<details>");
817+
cell.push_str("<summary>");
818+
cell.push_str(&format!("({plus}{percent}%)"));
819+
cell.push_str("</summary>");
820+
cell.push_str(&format!("Baseline: {baseline}"));
821+
cell.push_str("</details>");
815822
}
816823

817824
cell

‎lib/bencher_github/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[package]
22
name = "bencher_github"
3+
license.workspace = true
34
version.workspace = true
45
authors.workspace = true
56
edition.workspace = true

0 commit comments

Comments
 (0)