Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(ci): deploy the pushed commit's frontend, not main's tip (#7528)

Wolf Mermelsteindcf328a46d49
diff --git a/.github/workflows/deploy_web_app.yml b/.github/workflows/deploy_web_app.yml
index cff025b314..9f1a11bf1b 100644
--- a/.github/workflows/deploy_web_app.yml
+++ b/.github/workflows/deploy_web_app.yml
@@ -48,7 +48,7 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
with:
- ref: ${{ github.ref_name }}
+ ref: ${{ github.sha }}
- name: Mount Namespace cache volume
uses: namespacelabs/nscloud-cache-action@15799a6b54e5765f85b2aac25b3f0df43ed571c0
with:
diff --git a/tooling/xtask/crates/xtask_workflows/src/workflows/deploy_web_app.rs b/tooling/xtask/crates/xtask_workflows/src/workflows/deploy_web_app.rs
index 3059e2931d..a344b99e4e 100644
--- a/tooling/xtask/crates/xtask_workflows/src/workflows/deploy_web_app.rs
+++ b/tooling/xtask/crates/xtask_workflows/src/workflows/deploy_web_app.rs
@@ -120,7 +120,10 @@ fn checkout() -> Step<Use> {
"checkout",
"df4cb1c069e1874edd31b4311f1884172cec0e10",
) // v6
- .add_with(("ref", "${{ github.ref_name }}"))
+ // The pushed commit, not the branch tip: a merge that lands while this
+ // run's backend deploys must not ship its frontend against the older
+ // backend.
+ .add_with(("ref", "${{ github.sha }}"))
}
/// Build identical across dev/prod up to `MODE` (`just build-<env>`).