Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/build-app-cli/scripts/build-app-cli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ fi
parse_toolchain_from_channel_file() {
local file="$1"
# An extensionless `rust-toolchain` is EITHER a legacy single-line channel
# (e.g. `1.95.0`) OR a TOML document (`[toolchain]` + `channel = "..."`).
# (e.g. `1.98.1`) OR a TOML document (`[toolchain]` + `channel = "..."`).
# rustup accepts both, so detect the TOML form and parse its channel rather
# than taking the literal `[toolchain]` line as the channel.
if grep -qE '^[[:space:]]*\[toolchain\]' "$file"; then
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/deploy-core/scripts/resolve-project.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ source "$SCRIPT_DIR/common.sh"
# --- Rust toolchain resolution helpers ---------------------------------------
parse_toolchain_from_channel_file() {
# An extensionless `rust-toolchain` is EITHER a legacy single-line channel
# (e.g. `1.95.0`) OR a TOML document (`[toolchain]` + `channel = "..."`).
# (e.g. `1.98.1`) OR a TOML document (`[toolchain]` + `channel = "..."`).
# rustup accepts both, so detect the TOML form and parse its channel rather
# than taking the literal `[toolchain]` line as the channel.
if grep -qE '^[[:space:]]*\[toolchain\]' "$1"; then
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/deploy-core/tests/make-smoke-fixture.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ TOML
[package]
name = "fixture-app-cli"
version = "0.1.0"
edition = "2021"
edition = "2024"

[[bin]]
name = "fixture-app-cli"
Expand All @@ -52,7 +52,7 @@ edgezero-cli = { path = "../../../crates/edgezero-cli", default-features = false
clap = { version = "4", features = ["derive"] }
edgezero-core = { path = "../../../crates/edgezero-core" }
serde = { version = "1", features = ["derive"] }
validator = { version = "0.20", features = ["derive"] }
validator = { version = "0.21", features = ["derive"] }
TOML

cat >crates/fixture-app-cli/src/main.rs <<'RS'
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/deploy-core/tests/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1437,7 +1437,7 @@ cache_key_for() {
RUNNER_OS=Linux RUNNER_ARCH=X64 \
EDGEZERO__ACTION__ROOT="$REPO_ROOT" \
EDGEZERO__PROJECT__WORKING_DIRECTORY="${CK_WORKDIR:-app}" \
EDGEZERO__PROJECT__RUST_TOOLCHAIN="${CK_TOOLCHAIN:-1.95.0}" \
EDGEZERO__PROJECT__RUST_TOOLCHAIN="${CK_TOOLCHAIN:-1.98.1}" \
EDGEZERO__PROJECT__TARGET="${CK_TARGET:-wasm32-wasip1}" \
EDGEZERO__APP__CLI__VERSION="${CK_CLI_VERSION:-1.0.0}" \
EDGEZERO__BUILD__CACHE="${CK_CACHE:-false}" \
Expand Down Expand Up @@ -1621,7 +1621,7 @@ run_resolve_in() {
RUNNER_OS=Linux RUNNER_ARCH=X64 \
EDGEZERO__ACTION__ROOT="$REPO_ROOT" \
EDGEZERO__PROJECT__WORKING_DIRECTORY=app \
EDGEZERO__PROJECT__RUST_TOOLCHAIN=1.95.0 \
EDGEZERO__PROJECT__RUST_TOOLCHAIN=1.98.1 \
EDGEZERO__PROJECT__TARGET=wasm32-wasip1 \
EDGEZERO__PROJECT__MANIFEST="${BND_MANIFEST:-}" \
bash "$CORE_SCRIPTS/resolve-project.sh"
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/deploy-fastly/versions.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"fastly": {
"version": "15.1.0",
"version": "16.0.0",
"linux_amd64": {
"url": "https://github.com/fastly/cli/releases/download/v15.1.0/fastly_v15.1.0_linux-amd64.tar.gz",
"sha256": "3ba3d8a739b7a88d0a612825a9755d735efb87a9b02ea67e53a11b96d178d500"
"url": "https://github.com/fastly/cli/releases/download/v16.0.0/fastly_v16.0.0_linux-amd64.tar.gz",
"sha256": "b1b89112f1f1291ff275393779ffdacba8724ac64091bda0fa6000ae06308459"
}
},
"rust_target": "wasm32-wasip1"
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,13 @@ jobs:
- name: No legacy typed reads
run: ./scripts/check_no_legacy_typed_reads.sh

# `validator` is pinned in four places cargo cannot reconcile (this
# workspace, the excluded demo workspace, the scaffold seeds, and the
# deploy fixture). A mismatch only surfaces as a confusing
# "trait bound not satisfied" in a deploy smoke job, so gate it here.
- name: Shared dependency pins agree
run: ./scripts/check_shared_dep_pins.sh

- name: Nested AppConfig audit
run: cargo run -q --bin check_no_nested_app_config --features nested-app-config-check -- examples/app-demo crates/edgezero-cli/src/templates

Expand Down
22 changes: 11 additions & 11 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
fastly 15.1.0
nodejs 24.12.0
rust 1.95.0
fastly 16.0.0
nodejs 24.20.0
rust 1.98.1
# spin-cli is not pinned by asdf-style version managers (no
# asdf-spin plugin in widespread use). spin-sdk ~6.0 in the
# workspace imports wasi:http/types@0.3.0-rc-2026-03-15, which
# the Spin 3.6.x runtime does not provide; Spin 3.7+ is required
# for the demo's Spin adapter to boot. Install matching CLI
# manually (https://spinframework.dev/install) before running
# smoke_test_config_key_override.sh; otherwise set SKIP_SPIN=1.
viceroy 0.17.0
wasmtime 44.0.1
# asdf-spin plugin in widespread use). spin-sdk ~7.0 in the
# workspace imports wasi:http/types@0.3.0, which the Spin 4.0.x
# runtime does not provide; Spin 4.1+ is required for the demo's
# Spin adapter to boot. Install matching CLI manually
# (https://spinframework.dev/install) before running
# smoke_test_kv.sh spin; otherwise set SKIP_SPIN=1.
viceroy 0.21.0
wasmtime 48.0.1
6 changes: 3 additions & 3 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ scripts/ # Build/deploy/test helper scripts

## Toolchain & Versions

- **Rust**: 1.95.0 (from `.tool-versions`)
- **Node.js**: 24.12.0 (for docs site only)
- **Fastly CLI**: 15.1.0
- **Rust**: 1.98.1 (from `.tool-versions`)
- **Node.js**: 24.20.0 (for docs site only)
- **Fastly CLI**: 16.0.0
- **Edition**: 2024
- **Resolver**: 2
- **License**: Apache-2.0
Expand Down
Loading
Loading