Compare commits

..

2 commits

Author SHA1 Message Date
ee7504bdf2 Merge branch 'develop' into feature/27-json-setup
Some checks failed
continuous-integration/drone/push Build is failing
2023-12-09 16:42:28 +00:00
2091e326b8 Migrate to npm (#106)
All checks were successful
continuous-integration/drone/push Build is passing
# Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

- Migrate to using npm

#105

## Type of change

Please delete options that are not relevant.

- [x] Bug fix (non-breaking change which fixes an issue)

# How Has This Been Tested?

Please describe the tests that you ran to verify the changes. Provide instructions so we can reproduce. Please also list any relevant details to your test configuration.

# Checklist

- [ ] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that provde my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream modules

Reviewed-on: https://gitea.vylpes.xyz/External/card-drop/pulls/106
Reviewed-by: VylpesTester <tester@vylpes.com>
Co-authored-by: Ethan Lane <ethan@vylpes.com>
Co-committed-by: Ethan Lane <ethan@vylpes.com>
2023-12-09 16:40:23 +00:00
5 changed files with 9994 additions and 5354 deletions

View file

@ -51,14 +51,14 @@ steps:
- name: build
image: node
commands:
- yarn install --frozen-lockfile
- yarn build
- npm ci
- npm run build
- name: test
image: node
commands:
- yarn install --frozen-lockfile
- yarn test
- npm ci
- npm test
trigger:
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 delete card-drop_prod || true) \
&& cp .prod.env .env \
&& yarn clean \
&& yarn install --frozen-lockfile \
&& yarn build \
&& npm run clean \
&& npm ci \
&& npm run build \
&& docker compose --file docker-compose.prod.yml up -d \
&& echo "Sleeping for 10 seconds to let database load..." \
&& sleep 10 \
&& yarn run db:up \
&& npm run db:up \
&& 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 delete card-drop_stage || true) \
&& cp .stage.env .env \
&& yarn clean \
&& yarn install --frozen-lockfile \
&& yarn build \
&& npm run clean \
&& npm ci \
&& npm run build \
&& docker compose --file docker-compose.stage.yml up -d \
&& echo "Sleeping for 10 seconds to let database load..." \
&& sleep 10 \
&& yarn run db:up \
&& npm run db:up \
&& 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