-
Notifications
You must be signed in to change notification settings - Fork 0
Add Edge Cookie (EC) sync support for trusted-server integration #98
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
2c84cbc
7b8ca36
95122e7
b176dc8
4432e83
6faca82
020dbc2
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,11 +21,11 @@ async-trait = "0.1" | |
| axum = "0.8" | ||
| base64 = "0.22" | ||
| ed25519-dalek = "2.1" | ||
| edgezero-adapter-axum = { git = "https://github.com/stackpop/edgezero.git", branch = "main", package = "edgezero-adapter-axum", default-features = false } | ||
| edgezero-adapter-cloudflare = { git = "https://github.com/stackpop/edgezero.git", branch = "main", package = "edgezero-adapter-cloudflare", default-features = false } | ||
| edgezero-adapter-fastly = { git = "https://github.com/stackpop/edgezero.git", branch = "main", package = "edgezero-adapter-fastly", default-features = false } | ||
| edgezero-cli = { git = "https://github.com/stackpop/edgezero.git", branch = "main", package = "edgezero-cli" } | ||
| edgezero-core = { git = "https://github.com/stackpop/edgezero.git", branch = "main", package = "edgezero-core" } | ||
| edgezero-adapter-axum = { git = "https://github.com/stackpop/edgezero.git", branch = "feature/configureable-axum-host", package = "edgezero-adapter-axum", default-features = false } | ||
| edgezero-adapter-cloudflare = { git = "https://github.com/stackpop/edgezero.git", branch = "feature/configureable-axum-host", package = "edgezero-adapter-cloudflare", default-features = false } | ||
| edgezero-adapter-fastly = { git = "https://github.com/stackpop/edgezero.git", branch = "feature/configureable-axum-host", package = "edgezero-adapter-fastly", default-features = false } | ||
| edgezero-cli = { git = "https://github.com/stackpop/edgezero.git", branch = "feature/configureable-axum-host", package = "edgezero-cli" } | ||
| edgezero-core = { git = "https://github.com/stackpop/edgezero.git", branch = "feature/configureable-axum-host", package = "edgezero-core" } | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 🔧 Workspace deps pin to unmerged upstream branch All five This PR cannot cleanly land until:
Leaving deps on a feature branch also means |
||
| fastly = "0.11.9" | ||
| futures = { version = "0.3", features = ["std", "executor"] } | ||
| futures-util = "0.3.31" | ||
|
|
@@ -36,7 +36,9 @@ phf = { version = "0.11", features = ["macros"] } | |
| serde = { version = "1", features = ["derive"] } | ||
| serde_json = "1" | ||
| serde_repr = "0.1" | ||
| sha2 = "0.10" | ||
| simple_logger = "5" | ||
| subtle = "2" | ||
| thiserror = "1.0" | ||
| tokio = { version = "1", features = ["macros", "rt-multi-thread"] } | ||
| toml = "1.0" | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🔧 edgezero deps pinned to unmerged feature branch
All five
edgezero-*dependencies point atbranch = "feature/configureable-axum-host"instead ofmain. Merging this PR puts mocktioneer on an unmerged edgezero feature branch — if that branch is rebased, force-pushed, or deleted, CI breaks.Suggested fix: either (a) merge the edgezero feature branch to
mainfirst and repoint these deps, or (b) split the dep bump into its own PR. If the feature branch is genuinely needed for this PR's functionality, document why in the PR description.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Acknowledged. The edgezero
feature/configureable-axum-hostbranch (PR stackpop/edgezero#231) needs to be merged tomainfirst. Once that lands, we'll repoint all five deps tomain. Leaving this unresolved until that happens.