Skip to content

Commit baddbdc

Browse files
committed
Merge remote-tracking branch 'origin/main' into quantize-auction-transport-timeouts
# Conflicts: # crates/trusted-server-adapter-fastly/src/backend.rs # crates/trusted-server-core/src/auction/orchestrator.rs
2 parents 4828512 + 0e5dbb2 commit baddbdc

108 files changed

Lines changed: 9462 additions & 1077 deletions

File tree

Some content is hidden

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

.github/workflows/format.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ jobs:
5353
- name: Run host-target CLI clippy
5454
run: cargo clippy --package trusted-server-cli --target x86_64-unknown-linux-gnu --all-targets --all-features -- -D warnings
5555

56+
# The codegen crate is a workspace member but is not a default member and
57+
# is not covered by any adapter-scoped alias, so lint it explicitly.
58+
- name: Run host-target OpenRTB codegen clippy
59+
run: cargo clippy --package trusted-server-openrtb-codegen --target x86_64-unknown-linux-gnu --all-targets -- -D warnings
60+
5661
format-typescript:
5762
runs-on: ubuntu-latest
5863
defaults:

.github/workflows/test.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@ jobs:
8282
- name: Run host-target CLI tests
8383
run: ./scripts/test-cli.sh
8484

85+
# The codegen crate is not a default member and no adapter alias builds it,
86+
# so its tests only run if invoked explicitly on the host target.
87+
- name: Run host-target OpenRTB codegen tests
88+
run: |
89+
cargo test --package trusted-server-openrtb-codegen --target "$(rustc -vV | sed -n 's/host: //p')"
90+
8591
- name: Verify Fastly WASM release build
8692
run: cargo build --package trusted-server-adapter-fastly --release --target wasm32-wasip1
8793

Cargo.lock

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

Cargo.toml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ members = [
1010
"crates/trusted-server-integration-tests",
1111
"crates/trusted-server-js",
1212
"crates/trusted-server-openrtb",
13+
# Manual protobuf codegen tool — a member so it shares workspace settings,
14+
# but no default member or alias builds it. Run it explicitly with `-p`.
15+
"crates/trusted-server-openrtb-codegen",
1316
]
1417

1518
# Viceroy (cargo test-fastly runner) calls `cargo run --bin trusted-server-adapter-fastly`
@@ -25,6 +28,13 @@ default-members = [
2528
[profile.release]
2629
debug = 1
2730

31+
[workspace.package]
32+
authors = []
33+
edition = "2024"
34+
license = "Apache-2.0"
35+
publish = false
36+
version = "0.1.0"
37+
2838
[workspace.dependencies]
2939
anyhow = "1"
3040
async-trait = "0.1"
@@ -72,6 +82,7 @@ log-fastly = "0.12"
7282
lol_html = "2.7.2"
7383
matchit = "0.9"
7484
mime = "0.3"
85+
prost-build = "0.13"
7586
rand = "0.8"
7687
rcgen = { version = "0.13", features = ["x509-parser"] }
7788
regex = "1.12.3"

crates/trusted-server-adapter-axum/Cargo.toml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
[package]
22
name = "trusted-server-adapter-axum"
3-
version = "0.1.0"
4-
edition = "2024"
5-
publish = false
3+
description = "Axum entry point for Trusted Server — native dev server."
4+
authors = { workspace = true }
5+
edition = { workspace = true }
6+
license = { workspace = true }
7+
publish = { workspace = true }
8+
version = { workspace = true }
69

710
[lints]
811
workspace = true

crates/trusted-server-adapter-cloudflare/Cargo.toml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
[package]
22
name = "trusted-server-adapter-cloudflare"
3-
version = "0.1.0"
4-
edition = "2024"
5-
publish = false
3+
description = "Cloudflare Workers entry point for Trusted Server."
4+
authors = { workspace = true }
5+
edition = { workspace = true }
6+
license = { workspace = true }
7+
publish = { workspace = true }
8+
version = { workspace = true }
69

710
[lints]
811
workspace = true

crates/trusted-server-adapter-fastly/Cargo.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
[package]
22
name = "trusted-server-adapter-fastly"
3-
version = "0.1.0"
4-
edition = "2021"
3+
description = "Fastly Compute entry point for Trusted Server."
4+
authors = { workspace = true }
5+
edition = { workspace = true }
6+
license = { workspace = true }
7+
publish = { workspace = true }
8+
version = { workspace = true }
59

610
[lints]
711
workspace = true

0 commit comments

Comments
 (0)