From be76ef75c036ce2f8b8432508a1c2c3eb387cf2b Mon Sep 17 00:00:00 2001 From: NathanosDev Date: Sat, 11 Jan 2025 00:06:03 +0100 Subject: [PATCH] ci: fix env loading --- src/frontend/pull-global-config.mjs | 3 +++ src/marketing/astro.config.mjs | 5 ++++- src/marketing/src/environment.ts | 3 ++- turbo.json | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/frontend/pull-global-config.mjs b/src/frontend/pull-global-config.mjs index 609b2031..04ea3b6e 100644 --- a/src/frontend/pull-global-config.mjs +++ b/src/frontend/pull-global-config.mjs @@ -7,6 +7,9 @@ import { fileURLToPath } from 'node:url'; dotenv.config({ path: '.env', }); +dotenv.config({ + path: '../../.env', +}); const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); diff --git a/src/marketing/astro.config.mjs b/src/marketing/astro.config.mjs index 3147c6cc..d9a2d188 100644 --- a/src/marketing/astro.config.mjs +++ b/src/marketing/astro.config.mjs @@ -3,10 +3,13 @@ import storyblok from '@storyblok/astro'; import basicSsl from '@vitejs/plugin-basic-ssl'; import { loadEnv } from 'vite'; import netlify from '@astrojs/netlify'; +import path from 'path'; +const globalEnvPath = path.resolve(process.cwd(), '..', '..'); +const globalEnv = loadEnv('', globalEnvPath, 'DFX_NETWORK'); const env = loadEnv('', process.cwd(), 'STORYBLOK_TOKEN'); -const dfxNetwork = process.env.DFX_NETWORK ?? 'local'; +const dfxNetwork = globalEnv.DFX_NETWORK ?? 'local'; const isMainnet = dfxNetwork === 'ic'; const isStaging = dfxNetwork === 'staging'; diff --git a/src/marketing/src/environment.ts b/src/marketing/src/environment.ts index 07e52e5e..7ec4509e 100644 --- a/src/marketing/src/environment.ts +++ b/src/marketing/src/environment.ts @@ -1,7 +1,8 @@ import dotenv from 'dotenv'; +import path from 'path'; dotenv.config({ - path: '.env', + path: path.resolve(process.cwd(), '..', '..', '.env'), }); const dfxNetwork = process.env.DFX_NETWORK ?? 'local'; diff --git a/turbo.json b/turbo.json index 95b844d3..5e2a4c47 100644 --- a/turbo.json +++ b/turbo.json @@ -9,12 +9,12 @@ "angular.json", "dfx.json", "prettier.config.cjs", - "tsconfig.json", - ".env" + "tsconfig.json" ], "tasks": { "build": { "outputs": ["dist/**", "build/**", ".docusaurus/**", "loader/**", "www"], + "inputs": ["$TURBO_DEFAULT$", ".env"], "dependsOn": ["^build"] }, "test": {