Skip to content

Commit a25d343

Browse files
committed
Merge branch 'main' into feature/crate-part-1
2 parents fb2cba9 + 0715276 commit a25d343

File tree

7 files changed

+27
-8
lines changed

7 files changed

+27
-8
lines changed

.github/workflows/format.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,17 @@ jobs:
2424
~/.cargo/git/db/
2525
target/
2626
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
27+
28+
- name: Retrieve Rust version
29+
id: rust-version
30+
run: echo "rust-version=$(grep '^rust ' .tool-versions | awk '{print $2}')" >> $GITHUB_OUTPUT
31+
shell: bash
2732

2833
- name: Set up rust toolchain
2934
uses: actions-rust-lang/setup-rust-toolchain@v1
3035
with:
3136
components: "clippy, rustfmt"
32-
toolchain: 1.83
37+
toolchain: ${{ steps.rust-version.outputs.rust-version }}
3338

3439
- name: Add wasm32-wasi target
3540
run: rustup target add wasm32-wasip1

.github/workflows/test.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,15 @@ jobs:
2424
target/
2525
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
2626

27+
- name: Retrieve Rust version
28+
id: rust-version
29+
run: echo "rust-version=$(grep '^rust ' .tool-versions | awk '{print $2}')" >> $GITHUB_OUTPUT
30+
shell: bash
31+
2732
- name: Set up Rust tool chain
2833
uses: actions-rust-lang/setup-rust-toolchain@v1
2934
with:
30-
toolchain: 1.83
35+
toolchain: ${{ steps.rust-version.outputs.rust-version }}
3136

3237
- name: Add wasm32-wasi target
3338
run: rustup target add wasm32-wasip1

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2626
### Security
2727
- in case of vulnerabilities
2828

29+
## [1.0.6] - 2025-05-29
30+
31+
### Changed
32+
- Remove hard coded Fast ID in fastly.tom
33+
- Updated README to better describe what Trusted Server does and high-level goal
34+
- Use Rust toolchain version from .tool-versions for GitHub actions
35+
2936
## [1.0.5] - 2025-05-19
3037

3138
### Changed

Cargo.lock

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

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Trusted Server
22

3-
:information_source: At this time, Trusted Server is designed to work with Fastly. Follow these steps to configure Fastly Compute and deploy it.
3+
:information_source: Trusted Server is an open-source runtime and edge-orchestration layer for modern publishers - executing 3rd-party scripts and your entire ad-stack server-side, all under 1st-party control. Our goal is to move ad-related code execution and control from web browsers to publisher controlled, "trusted" edge-cloud infrastructure.
4+
5+
Trusted Server is the new execution layer for the open-web - returning control of 1st party data, security, and overall user-experience back to publishers.
6+
7+
At this time, Trusted Server is designed to work with Fastly Compute. Follow these steps to configure Fastly Compute and deploy it.
48

59
## Fastly
610
- Create account at Fastly if you don’t have one - manage.fastly.com

crates/common/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ log-fastly = "0.10.0"
2323
serde = { version = "1.0", features = ["derive"] }
2424
serde_json = "1.0.91"
2525
sha2 = "0.10.6"
26-
tokio = { version = "1.0", features = ["sync", "macros", "io-util", "rt", "time"] }
26+
tokio = { version = "1.43", features = ["sync", "macros", "io-util", "rt", "time"] }
2727
url = "2.4.1"

fastly.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ description = "aslk"
77
language = "rust"
88
manifest_version = 3
99
name = "trusted-server-fastly"
10-
service_id = "q9waEnTgJfqQV1a0cYOuo3"
1110

1211
[scripts]
1312
build = """
1413
cargo build --bin trusted-server-fastly --release --target wasm32-wasip1 --color always
1514
"""
1615

17-
1816
[local_server]
1917
[local_server.backends]
2018
[local_server.backends.equativ_ad_api_2] # FIX ME: must match config

0 commit comments

Comments
 (0)