Skip to content

Commit d0ac769

Browse files
💚 fix deployment (#339)
- Add `prisma deploy` to the deploy pipeline - Add correct env var values when building the client - Require e2e tests to pass before deploying
1 parent 748af10 commit d0ac769

File tree

2 files changed

+26
-5
lines changed

2 files changed

+26
-5
lines changed

‎.circleci/config.yml‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
- run:
8585
command: npm run prettier:check
8686
working_directory: e2e
87-
test:
87+
e2e-test:
8888
executor: e2e-runner
8989
steps:
9090
- checkout
@@ -134,12 +134,16 @@ jobs:
134134
- run:
135135
command: npm run build
136136
working_directory: client
137+
environment:
138+
REACT_APP_GRAPHQL_ENDPOINT: /gql
139+
REACT_APP_REST_ENDPOINT: /rest
140+
REACT_APP_FAQ_URL: faq.team
137141
- persist_to_workspace:
138142
root: .
139143
paths:
140144
- client/build/
141145

142-
prisma-deploy:
146+
prisma-deploy-server:
143147
parameters:
144148
clever-app-id:
145149
type: string
@@ -171,6 +175,17 @@ jobs:
171175
clever link << parameters.clever-app-id >>
172176
clever deploy --force
173177
178+
prisma-deploy-service:
179+
executor: app-builder
180+
steps:
181+
- checkout
182+
- node/install-packages:
183+
app-dir: server
184+
- run:
185+
name: Deploy prisma
186+
working_directory: server/scripts/prisma_deploy_all/
187+
command: node index.js
188+
174189
app-deploy:
175190
parameters:
176191
clever-app-id:
@@ -213,20 +228,26 @@ workflows:
213228
- server-lint
214229
- client-lint
215230
- e2e-lint
216-
- test
231+
- e2e-test
217232
- client-build
218233
- app-deploy:
219234
clever-app-id: app_c61407ae-b417-4406-86ed-cfd1acf84466
220235
context: clever-cloud-deployment
221236
requires:
222237
- server-lint
223238
- client-lint
239+
- e2e-lint
240+
- e2e-test
224241
- client-build
225242
filters:
226243
branches:
227244
only: main
228-
- prisma-deploy:
245+
- prisma-deploy-server:
229246
clever-app-id: app_f9c5c1cb-fe9c-41f9-a6c0-793e8326e95b
230247
context: clever-cloud-deployment
231248
requires:
232249
- app-deploy
250+
- prisma-deploy-service:
251+
context: faq-prisma-deployment
252+
requires:
253+
- prisma-deploy-server

‎server/scripts/helpers.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ const queryManagement = gql => {
9292
// Implicit env required: PRISMA_URL, PRISMA_API_SECRET
9393
const deployPrismaService = (name, stage) => {
9494
const isForcing = process.argv.includes('--force')
95-
run('prisma deploy ' + (isForcing ? '--force' : ''), {
95+
run('npx prisma deploy ' + (isForcing ? '--force' : ''), {
9696
PRISMA_URL: process.env.PRISMA_URL + '/' + name + '/' + stage
9797
})
9898
}

0 commit comments

Comments
 (0)