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 18 commits into
base: main
Choose a base branch
from
Open

Upgrade EdgeZero to the deploy-actions branch #940

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
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
46b7052
Merge branch 'main' into worktree-edgezero-316-upgrade
aram356 Aug 20, 2026
f90f638
Pin edgezero dependencies to immutable rev instead of branch
aram356 Aug 21, 2026
bf47680
Document new CLI lifecycle and config gc commands
aram356 Aug 21, 2026
40dd9b3
Drop stale EdgeZero v0.0.4 qualifiers from env-overlay docs
aram356 Aug 21, 2026
7fc5e9b
Merge branch 'main' into worktree-edgezero-316-upgrade
aram356 Aug 22, 2026
87546d3
Document the staged-deploy config leg and correct healthcheck retry w…
aram356 Aug 22, 2026
01d7f61
Extend CLI parse tests for staging config flags, gc gate, and --version
aram356 Aug 22, 2026
4aee052
Refresh secret-fields comment and drop last v0.0.4 qualifiers
aram356 Aug 22, 2026
dd8bcdd
Merge branch 'main' into worktree-edgezero-316-upgrade
aram356 Aug 22, 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
50 changes: 37 additions & 13 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", rev = "5f3d648c3c6c38fc6e6b22b5c65c66177363aad8", default-features = false }
Comment thread
aram356 marked this conversation as resolved.

@prk-Jr prk-Jr Aug 24, 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 — Upstream stackpop/edgezero#316 is still open, so this pin is immutable but branch-scoped.

Re-verified against the upstream API at review time, not carried over from the last round:

  • repos/stackpop/edgezero/pulls/316 -> state: open, merged: false, merged_at: null, head b3e02111, mergeable_state: clean.
  • compare/5f3d648c...main -> status: behind, ahead_by: 0, behind_by: 116 — the pinned commit is 116 commits ahead of edgezero main, so feature/edgezero-deploy-actions is the only ref keeping it fetchable.
  • Tag list unchanged: v0.0.5 = a2d0c538, v0.0.4 = 9e661ae5. No tag contains 5f3d648c.

Why this still blocks even though the body records it: this PR is non-draft and MERGEABLE, so nothing mechanical stops it landing before the repin. Two consequences follow.

  1. Deleting the feature branch after Remove immutable cache headers from integrations #316 merges — the GitHub default — makes cargo fetch fail on every cold checkout and CI runner. The rev pin is immutable, not unconditionally fetchable.
  2. A squash merge of Remove immutable cache headers from integrations #316 produces a commit that is not an ancestor of 5f3d648c, so "rev -> tag" becomes a repin to different bytes plus a full gate re-run, not a reference swap. A merge commit or fast-forward keeps 5f3d648c an ancestor and keeps the swap mechanical.

No code change requested here — this comment is the merge gate, and it is the only reason the verdict is REQUEST_CHANGES rather than COMMENT. Worth confirming the merge method on #316 before planning the repin, and moving the deployer's deploy-fastly@<ref> in lockstep.

edgezero-adapter-cloudflare = { git = "https://github.com/stackpop/edgezero", rev = "5f3d648c3c6c38fc6e6b22b5c65c66177363aad8", default-features = false }
edgezero-adapter-fastly = { git = "https://github.com/stackpop/edgezero", rev = "5f3d648c3c6c38fc6e6b22b5c65c66177363aad8", default-features = false }
edgezero-adapter-spin = { git = "https://github.com/stackpop/edgezero", rev = "5f3d648c3c6c38fc6e6b22b5c65c66177363aad8", default-features = false }
edgezero-cli = { git = "https://github.com/stackpop/edgezero", rev = "5f3d648c3c6c38fc6e6b22b5c65c66177363aad8" }
edgezero-core = { git = "https://github.com/stackpop/edgezero", rev = "5f3d648c3c6c38fc6e6b22b5c65c66177363aad8", default-features = false }
env_logger = "0.11"
error-stack = "0.6"
esi = "0.7.2"
Expand Down
Loading
Loading