Skip to content

Commit

Permalink
Merge branch 'develop' into artur-web3login
Browse files Browse the repository at this point in the history
  • Loading branch information
arturgontijo committed Sep 29, 2024
2 parents 68e641a + 31b1648 commit ad69b3a
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 5,446 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
uses: actions/checkout@v3

- name: Setup
uses: actions/setup-node@v3
uses: oven-sh/setup-bun@v2
with:
node-version: 20.x
bun-version: 1.1.29

- name: Environment
run: |
Expand All @@ -48,16 +48,16 @@ jobs:
echo "" >> .env
- name: Install
run: yarn install --frozen-lockfile
run: bun i

- name: Format
run: yarn format
run: bun run format

- name: Lint
run: yarn lint
run: bun run lint

- name: Test
run: yarn test
run: bun run test

- name: Build
run: yarn build
run: bun run build
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
Polkadot Education API (backend)

```
yarn
bun i
```

```
yarn test
bun run test
```

```
yarn dev
bun dev
```
Binary file added bun.lockb
Binary file not shown.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"main": "dist/index.js",
"scripts": {
"dev": "nodemon",
"test": "yarn run test:mongodb:setup; NODE_ENV=test jest; yarn run test:mongodb:setup; yarn run test:mongodb:rm",
"test:mongodb:setup": "yarn run test:mongodb:rm; yarn run test:mongodb:run",
"test": "bun run test:mongodb:setup; NODE_ENV=test jest; bun run test:mongodb:rm",
"test:mongodb:setup": "bun run test:mongodb:rm; bun run test:mongodb:run",
"test:mongodb:rm": "docker rm -f doteducation-mongodb-test",
"test:mongodb:run": "docker run --name doteducation-mongodb-test -p 27777:27017 -dti mongo:7.0.5-jammy",
"lint": "eslint .",
Expand Down
Loading

0 comments on commit ad69b3a

Please sign in to comment.