Skip to content

Upgrade EdgeZero to the deploy-actions branch #940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aram356 wants to merge 9 commits into
base: main
Choose a base branch
from
+306 −28
Open

Upgrade EdgeZero to the deploy-actions branch #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bc13f27
Upgrade EdgeZero to the deploy-actions branch
aram356 Jul 20, 2026
e4a8f37
Merge branch 'main' into worktree-edgezero-316-upgrade
aram356 Jul 21, 2026
96dd1f7
Merge branch 'main' into worktree-edgezero-316-upgrade
aram356 Jul 22, 2026
1e7b4ca
Merge remote-tracking branch 'origin/main' into worktree-edgezero-316…
aram356 Jul 26, 2026
b743345
Update EdgeZero to latest deploy-actions branch tip
aram356 Aug 4, 2026
5420390
Sync EdgeZero to latest deploy-actions tip and adopt config gc
aram356 Aug 15, 2026
b23f270
Merge remote-tracking branch 'origin/main' into worktree-edgezero-316…
aram356 Aug 15, 2026
fe5767e
Sync EdgeZero to deploy-actions tip 5f3d648c
aram356 Aug 16, 2026
fc969ce
Merge branch 'main' into worktree-edgezero-316-upgrade
aram356 Aug 19, 2026
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
60 changes: 42 additions & 18 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ criterion = { version = "0.5", default-features = false, features = ["cargo_benc
derive_more = { version = "2.0", features = ["display", "error"] }
directories = "5"
ed25519-dalek = { version = "2.2", features = ["rand_core"] }
edgezero-adapter-axum = { git = "https://github.com/stackpop/edgezero", tag = "v0.0.4", default-features = false }
edgezero-adapter-cloudflare = { git = "https://github.com/stackpop/edgezero", tag = "v0.0.4", default-features = false }
edgezero-adapter-fastly = { git = "https://github.com/stackpop/edgezero", tag = "v0.0.4", default-features = false }
edgezero-adapter-spin = { git = "https://github.com/stackpop/edgezero", tag = "v0.0.4", default-features = false }
edgezero-cli = { git = "https://github.com/stackpop/edgezero", tag = "v0.0.4" }
edgezero-core = { git = "https://github.com/stackpop/edgezero", tag = "v0.0.4", default-features = false }
edgezero-adapter-axum = { git = "https://github.com/stackpop/edgezero", branch = "feature/edgezero-deploy-actions", default-features = false }
edgezero-adapter-cloudflare = { git = "https://github.com/stackpop/edgezero", branch = "feature/edgezero-deploy-actions", default-features = false }
edgezero-adapter-fastly = { git = "https://github.com/stackpop/edgezero", branch = "feature/edgezero-deploy-actions", default-features = false }
edgezero-adapter-spin = { git = "https://github.com/stackpop/edgezero", branch = "feature/edgezero-deploy-actions", default-features = false }
edgezero-cli = { git = "https://github.com/stackpop/edgezero", branch = "feature/edgezero-deploy-actions" }
edgezero-core = { git = "https://github.com/stackpop/edgezero", branch = "feature/edgezero-deploy-actions", default-features = false }

@prk-Jr prk-Jr Aug 17, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔧 wrench — Six deps now point at a live branch of an unmerged upstream PR, and this PR is no longer a draft.

Verified against the upstream API: stackpop/edgezero#316 is state: open, merged: false. This PR reports isDraft: false and mergeable: MERGEABLE, so nothing mechanically prevents merging a branch = ref into main. Cargo.lock currently pins 5f3d648c, but that pin is only as durable as the lockfile — any cargo update, or a cargo install/fresh resolve that does not pass --locked, silently retargets whatever the branch tip is at that moment. A force-push or branch deletion upstream breaks the fetch outright.

The PR body already flags this, but the PR state doesn't match the caveat.

Fix — either flip back to draft until #316 merges and a tag is cut, or pin immutably in the meantime:

edgezero-core = { git = "https://github.com/stackpop/edgezero", rev = "5f3d648c3c6c38fc6e6b22b5c65c66177363aad8", default-features = false }

A rev gives the same code as today's lock while making the reference immutable, so the repin-before-merge step becomes rev → tag rather than "remember not to merge this."

env_logger = "0.11"
error-stack = "0.6"
fastly = "0.12"
Expand Down
Loading
Loading