Skip to content

Commit 858e3a5

Browse files
author
Joan Reyero
authored
Simplified start of development environment (#5)
1 parent 194f978 commit 858e3a5

9 files changed

Lines changed: 45 additions & 44 deletions

File tree

.github/workflows/CI-node.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
uses: actions/checkout@v2
5353

5454
- name: Install root dependencies
55-
run: sed -i -e 's/postinstall/'randomthing'/g' ./package.json && npm ci
55+
run: npm ci
5656

5757
- name: Run tests
5858
working-directory: ./backend
@@ -70,8 +70,8 @@ jobs:
7070
- name: Check out repository code
7171
uses: actions/checkout@v2
7272

73-
- name: Install root dependencies
74-
run: npm ci
73+
- name: Install dependencies
74+
run: npm ci && cd ./src/serverless/integrations && npm ci && cd ./../dbOperations && npm ci && cd ./../microservices/nodejs && npm ci
7575

7676
- name: change db port in env
7777
working-directory: ./backend

.github/workflows/api-docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
uses: actions/checkout@v2
1717

1818
- name: Install root dependencies
19-
run: sed -i -e 's/postinstall/'randomthing'/g' ./package.json && npm ci
19+
run: npm ci
2020

2121
- name: Run docs script
2222
working-directory: ./backend

backend/Dockerfile-backend

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ FROM node:16.16.0 as builder
33
WORKDIR /usr/crowd/backend
44
COPY . .
55

6-
RUN sed -i -e 's/postinstall/'randomthing'/g' ./package.json && \
7-
npm install && \
6+
RUN npm install && \
87
npm run build && \
98
cp ./package.json ./dist/package.json
109

backend/Dockerfile-backend-dev

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,4 @@ RUN cd ./src/serverless/microservices/python \
3535
&& cd ../microservices/nodejs && npm i \
3636
&& cd ../python/serverless && npm i \
3737
&& cd /usr/crowd/backend \
38-
&& sed -i -e 's/postinstall/'randomthing'/g' ./package.json \
3938
&& npm i

backend/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
"stripe:login": "stripe login",
2525
"stripe:start": "stripe listen --forward-to localhost:8080/api/plan/stripe/webhook",
2626
"lint": "npx eslint .",
27-
"format": "npx prettier --write .",
28-
"postinstall": "bash ./util/postinstall.sh"
27+
"format": "npx prettier --write ."
2928
},
3029
"dependencies": {
3130
"@cubejs-client/core": "^0.30.4",

backend/src/serverless/integrations/usecases/chat/getThreads.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,3 @@ async function getChannels(
3333
}
3434

3535
export default getChannels
36-
37-
// getDestinations('877903817948147752', 'ODc3OTEwNjM0MzA4NzA2MzI0.YR5f_g.TrYuoK2yWA5-LpPlDQ0Nlzc8dOE')

backend/util/install-all.sh

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
2+
#!/usr/bin/bash
3+
4+
pushd backend
5+
npm ci
6+
popd
7+
8+
pushd backend/src/serverless/integrations
9+
npm ci
10+
npm run sls-webpack
11+
popd
12+
13+
pushd backend/src/serverless/dbOperations
14+
npm ci
15+
npm run sls-webpack
16+
popd
17+
18+
pushd backend/src/serverless/microservices/nodejs
19+
npm ci
20+
npm run sls-webpack
21+
popd
22+
23+
pushd ../premium/conversations
24+
npm ci
25+
popd
26+
27+
python3.8 -m venv venv-crowd
28+
source venv-crowd/bin/activate
29+
pip install --upgrade pip
30+
31+
pushd backend/src/serverless/microservices/python
32+
pip install -r requirements.txt
33+
pip install -r requirements.dev.txt
34+
popd
35+
36+
pushd backend/src/serverless/microservices/python/serverless
37+
npm ci
38+
popd

backend/util/postinstall.sh

Lines changed: 0 additions & 33 deletions
This file was deleted.

start.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,6 @@ echo $IS_DEV
4545
if [[ "$IS_DEV" = false ]]; then
4646
cd $CLI_HOME/docker && docker-compose -p crowd up --force-recreate
4747
else
48+
bash backend/util/install-all.sh
4849
cd $CLI_HOME/docker && docker-compose -f docker-compose.yaml -f docker-compose.dev.yaml -p crowd up --force-recreate
4950
fi

0 commit comments

Comments
 (0)