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): keep BASH_ENV from restoring LD_LIBRARY_PATH in the website build (#7338)

teo8aa14305ee86
diff --git a/.github/workflows/deploy_website.yml b/.github/workflows/deploy_website.yml
index 9e82d64891..45979636cb 100644
--- a/.github/workflows/deploy_website.yml
+++ b/.github/workflows/deploy_website.yml
@@ -73,7 +73,7 @@ jobs:
with:
playwright: 'true'
- name: Build
- run: env -u LD_LIBRARY_PATH bun run build
+ run: env -u LD_LIBRARY_PATH -u BASH_ENV bun run build
env:
VITE_APP_BASE_URL: ${{ matrix.environment == 'prod' && 'https://macro.com' || 'https://dev.macro.com' }}
VITE_GOOGLE_SSO_URL: ${{ matrix.environment == 'prod' && 'https://gateway.macro.com/auth/login/sso?idp_name=google_gmail' || 'https://dev-gateway.macro.com/auth/login/sso?idp_name=google_gmail' }}
diff --git a/tooling/xtask/crates/xtask_workflows/src/workflows/deploy_website.rs b/tooling/xtask/crates/xtask_workflows/src/workflows/deploy_website.rs
index d97a2c3d27..74c3bdba13 100644
--- a/tooling/xtask/crates/xtask_workflows/src/workflows/deploy_website.rs
+++ b/tooling/xtask/crates/xtask_workflows/src/workflows/deploy_website.rs
@@ -149,9 +149,9 @@ fn verify_lfs_videos() -> Step<Run> {
fn build() -> Step<Run> {
Step::new("Build")
- // The dev shell's Linux LD_LIBRARY_PATH (re-applied via BASH_ENV) makes Playwright's
- // glibc-linked Chromium load Nix libs built against a newer glibc, so it fails to launch.
- .run("env -u LD_LIBRARY_PATH bun run build")
+ // The dev shell's Linux LD_LIBRARY_PATH makes Playwright's glibc-linked Chromium load Nix
+ // libs built against a newer glibc. Drop BASH_ENV too: bun runs scripts via bash, which re-sources it.
+ .run("env -u LD_LIBRARY_PATH -u BASH_ENV bun run build")
.working_directory(xtask_paths::repo_dir!("apps/marketing"))
// Canonical URLs, sitemap and robots are baked in at build time.
.add_env(Env::new(
diff --git a/tooling/xtask/crates/xtask_workflows/src/workflows/deploy_website/test.rs b/tooling/xtask/crates/xtask_workflows/src/workflows/deploy_website/test.rs
index 962bcc5c09..c783a01719 100644
--- a/tooling/xtask/crates/xtask_workflows/src/workflows/deploy_website/test.rs
+++ b/tooling/xtask/crates/xtask_workflows/src/workflows/deploy_website/test.rs
@@ -7,7 +7,7 @@ fn deploy_publishes_the_marketing_build_through_the_website_stack() {
[
"lfs: 'true'",
"working-directory: apps/marketing",
- "run: env -u LD_LIBRARY_PATH bun run build",
+ "run: env -u LD_LIBRARY_PATH -u BASH_ENV bun run build",
"'https://macro.com'",
"work-dir: ./infra/stacks/website",
"stack-name: macro-inc/${{ matrix.environment }}",