mirror of
https://github.com/MODSetter/SurfSense.git
synced 2026-06-22 21:28:12 +02:00
ci: align workflows and playwright with runtime env vars
This commit is contained in:
parent
1313ec2109
commit
2fb0f0c050
4 changed files with 9 additions and 9 deletions
2
.github/workflows/desktop-release.yml
vendored
2
.github/workflows/desktop-release.yml
vendored
|
|
@ -96,9 +96,11 @@ jobs:
|
||||||
working-directory: surfsense_web
|
working-directory: surfsense_web
|
||||||
env:
|
env:
|
||||||
NEXT_PUBLIC_FASTAPI_BACKEND_URL: ${{ vars.NEXT_PUBLIC_FASTAPI_BACKEND_URL }}
|
NEXT_PUBLIC_FASTAPI_BACKEND_URL: ${{ vars.NEXT_PUBLIC_FASTAPI_BACKEND_URL }}
|
||||||
|
SURFSENSE_BACKEND_INTERNAL_URL: ${{ vars.NEXT_PUBLIC_FASTAPI_BACKEND_URL }}
|
||||||
NEXT_PUBLIC_ZERO_CACHE_URL: ${{ vars.NEXT_PUBLIC_ZERO_CACHE_URL }}
|
NEXT_PUBLIC_ZERO_CACHE_URL: ${{ vars.NEXT_PUBLIC_ZERO_CACHE_URL }}
|
||||||
NEXT_PUBLIC_DEPLOYMENT_MODE: ${{ vars.NEXT_PUBLIC_DEPLOYMENT_MODE }}
|
NEXT_PUBLIC_DEPLOYMENT_MODE: ${{ vars.NEXT_PUBLIC_DEPLOYMENT_MODE }}
|
||||||
NEXT_PUBLIC_FASTAPI_BACKEND_AUTH_TYPE: ${{ vars.NEXT_PUBLIC_FASTAPI_BACKEND_AUTH_TYPE }}
|
NEXT_PUBLIC_FASTAPI_BACKEND_AUTH_TYPE: ${{ vars.NEXT_PUBLIC_FASTAPI_BACKEND_AUTH_TYPE }}
|
||||||
|
NEXT_PUBLIC_ETL_SERVICE: ${{ vars.NEXT_PUBLIC_ETL_SERVICE }}
|
||||||
NEXT_PUBLIC_POSTHOG_KEY: ${{ secrets.NEXT_PUBLIC_POSTHOG_KEY }}
|
NEXT_PUBLIC_POSTHOG_KEY: ${{ secrets.NEXT_PUBLIC_POSTHOG_KEY }}
|
||||||
|
|
||||||
- name: Install desktop dependencies
|
- name: Install desktop dependencies
|
||||||
|
|
|
||||||
5
.github/workflows/docker-build.yml
vendored
5
.github/workflows/docker-build.yml
vendored
|
|
@ -199,11 +199,6 @@ jobs:
|
||||||
build-args: |
|
build-args: |
|
||||||
${{ matrix.image == 'backend' && format('USE_CUDA={0}', matrix.use_cuda) || '' }}
|
${{ matrix.image == 'backend' && format('USE_CUDA={0}', matrix.use_cuda) || '' }}
|
||||||
${{ matrix.image == 'backend' && format('CUDA_EXTRA={0}', matrix.cuda_extra) || '' }}
|
${{ matrix.image == 'backend' && format('CUDA_EXTRA={0}', matrix.cuda_extra) || '' }}
|
||||||
${{ matrix.image == 'web' && 'NEXT_PUBLIC_FASTAPI_BACKEND_URL=__NEXT_PUBLIC_FASTAPI_BACKEND_URL__' || '' }}
|
|
||||||
${{ matrix.image == 'web' && 'NEXT_PUBLIC_FASTAPI_BACKEND_AUTH_TYPE=__NEXT_PUBLIC_FASTAPI_BACKEND_AUTH_TYPE__' || '' }}
|
|
||||||
${{ matrix.image == 'web' && 'NEXT_PUBLIC_ETL_SERVICE=__NEXT_PUBLIC_ETL_SERVICE__' || '' }}
|
|
||||||
${{ matrix.image == 'web' && 'NEXT_PUBLIC_ZERO_CACHE_URL=__NEXT_PUBLIC_ZERO_CACHE_URL__' || '' }}
|
|
||||||
${{ matrix.image == 'web' && 'NEXT_PUBLIC_DEPLOYMENT_MODE=__NEXT_PUBLIC_DEPLOYMENT_MODE__' || '' }}
|
|
||||||
|
|
||||||
- name: Export digest
|
- name: Export digest
|
||||||
run: |
|
run: |
|
||||||
|
|
|
||||||
5
.github/workflows/e2e-tests.yml
vendored
5
.github/workflows/e2e-tests.yml
vendored
|
|
@ -27,9 +27,10 @@ jobs:
|
||||||
PLAYWRIGHT_TEST_EMAIL: e2e-test@surfsense.net
|
PLAYWRIGHT_TEST_EMAIL: e2e-test@surfsense.net
|
||||||
PLAYWRIGHT_TEST_PASSWORD: E2eTestPassword123!
|
PLAYWRIGHT_TEST_PASSWORD: E2eTestPassword123!
|
||||||
# Frontend env: Playwright's webServer (surfsense_web/playwright.config.ts)
|
# Frontend env: Playwright's webServer (surfsense_web/playwright.config.ts)
|
||||||
# spawns `pnpm build && pnpm start` in CI; these get baked into the build.
|
# spawns `pnpm build && pnpm start` in CI.
|
||||||
NEXT_PUBLIC_FASTAPI_BACKEND_URL: http://localhost:8000
|
NEXT_PUBLIC_FASTAPI_BACKEND_URL: http://localhost:8000
|
||||||
NEXT_PUBLIC_FASTAPI_BACKEND_AUTH_TYPE: LOCAL
|
SURFSENSE_BACKEND_INTERNAL_URL: http://localhost:8000
|
||||||
|
AUTH_TYPE: LOCAL
|
||||||
# Shared secret for the test-only POST /__e2e__/auth/token endpoint.
|
# Shared secret for the test-only POST /__e2e__/auth/token endpoint.
|
||||||
# Must match docker-compose.e2e.yml's backend env (x-backend-env).
|
# Must match docker-compose.e2e.yml's backend env (x-backend-env).
|
||||||
E2E_MINT_SECRET: e2e-mint-secret-not-for-production
|
E2E_MINT_SECRET: e2e-mint-secret-not-for-production
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,8 @@ const zeroCacheURL = useProxyOrigin ? `${baseURL}/zero` : `http://localhost:${ZE
|
||||||
process.env.PLAYWRIGHT_TEST_EMAIL ??= "e2e-test@surfsense.net";
|
process.env.PLAYWRIGHT_TEST_EMAIL ??= "e2e-test@surfsense.net";
|
||||||
process.env.PLAYWRIGHT_TEST_PASSWORD ??= "E2eTestPassword123!";
|
process.env.PLAYWRIGHT_TEST_PASSWORD ??= "E2eTestPassword123!";
|
||||||
process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL ??= backendURL;
|
process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL ??= backendURL;
|
||||||
process.env.NEXT_PUBLIC_FASTAPI_BACKEND_AUTH_TYPE ??= "LOCAL";
|
process.env.SURFSENSE_BACKEND_INTERNAL_URL ??= backendURL;
|
||||||
|
process.env.AUTH_TYPE ??= "LOCAL";
|
||||||
process.env.NEXT_PUBLIC_ZERO_CACHE_URL ??= zeroCacheURL;
|
process.env.NEXT_PUBLIC_ZERO_CACHE_URL ??= zeroCacheURL;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -72,7 +73,8 @@ export default defineConfig({
|
||||||
stderr: "pipe",
|
stderr: "pipe",
|
||||||
env: {
|
env: {
|
||||||
NEXT_PUBLIC_FASTAPI_BACKEND_URL: process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL,
|
NEXT_PUBLIC_FASTAPI_BACKEND_URL: process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL,
|
||||||
NEXT_PUBLIC_FASTAPI_BACKEND_AUTH_TYPE: process.env.NEXT_PUBLIC_FASTAPI_BACKEND_AUTH_TYPE,
|
SURFSENSE_BACKEND_INTERNAL_URL: process.env.SURFSENSE_BACKEND_INTERNAL_URL,
|
||||||
|
AUTH_TYPE: process.env.AUTH_TYPE,
|
||||||
NEXT_PUBLIC_ZERO_CACHE_URL: process.env.NEXT_PUBLIC_ZERO_CACHE_URL,
|
NEXT_PUBLIC_ZERO_CACHE_URL: process.env.NEXT_PUBLIC_ZERO_CACHE_URL,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue