Merge branch 'develop' into feature/27-json-setup
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
Ethan Lane 2023-12-09 16:42:28 +00:00
commit ee7504bdf2
5 changed files with 9994 additions and 5354 deletions

View file

@ -51,14 +51,14 @@ steps:
- name: build - name: build
image: node image: node
commands: commands:
- yarn install --frozen-lockfile - npm ci
- yarn build - npm run build
- name: test - name: test
image: node image: node
commands: commands:
- yarn install --frozen-lockfile - npm ci
- yarn test - npm test
trigger: trigger:
branch: branch:

9982
package-lock.json generated Normal file

File diff suppressed because it is too large Load diff

View file

@ -13,11 +13,11 @@ cd ~/apps/card-drop/card-drop_prod \
&& (pm2 stop card-drop_prod || true) \ && (pm2 stop card-drop_prod || true) \
&& (pm2 delete card-drop_prod || true) \ && (pm2 delete card-drop_prod || true) \
&& cp .prod.env .env \ && cp .prod.env .env \
&& yarn clean \ && npm run clean \
&& yarn install --frozen-lockfile \ && npm ci \
&& yarn build \ && npm run build \
&& docker compose --file docker-compose.prod.yml up -d \ && docker compose --file docker-compose.prod.yml up -d \
&& echo "Sleeping for 10 seconds to let database load..." \ && echo "Sleeping for 10 seconds to let database load..." \
&& sleep 10 \ && sleep 10 \
&& yarn run db:up \ && npm run db:up \
&& NODE_ENV=production pm2 start --name card-drop_prod dist/bot.js && NODE_ENV=production pm2 start --name card-drop_prod dist/bot.js

View file

@ -13,11 +13,11 @@ cd ~/apps/card-drop/card-drop_stage \
&& (pm2 stop card-drop_stage || true) \ && (pm2 stop card-drop_stage || true) \
&& (pm2 delete card-drop_stage || true) \ && (pm2 delete card-drop_stage || true) \
&& cp .stage.env .env \ && cp .stage.env .env \
&& yarn clean \ && npm run clean \
&& yarn install --frozen-lockfile \ && npm ci \
&& yarn build \ && npm run build \
&& docker compose --file docker-compose.stage.yml up -d \ && docker compose --file docker-compose.stage.yml up -d \
&& echo "Sleeping for 10 seconds to let database load..." \ && echo "Sleeping for 10 seconds to let database load..." \
&& sleep 10 \ && sleep 10 \
&& yarn run db:up \ && npm run db:up \
&& NODE_ENV=production pm2 start --name card-drop_stage dist/bot.js && NODE_ENV=production pm2 start --name card-drop_stage dist/bot.js

5342
yarn.lock

File diff suppressed because it is too large Load diff