Skip to content

Commit

Permalink
Merge branch 'main' into #17-Socket-IO
Browse files Browse the repository at this point in the history
  • Loading branch information
Peyton-McKee committed Sep 14, 2023
2 parents ab34e82 + 1c196ce commit f8cbfb2
Show file tree
Hide file tree
Showing 11 changed files with 135 additions and 2,287 deletions.
29 changes: 29 additions & 0 deletions .github/workflows/tests-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Tests

on:
push:
branches:
- main
pull_request:
branches:
- main
- 'feature/**'
jobs:
run-tests:
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: 16.17.1
cache: npm
- name: Install modules
run: npm install && npm run prisma:generate && npm run prisma:migrate
- name: Run tests
run: npm run test
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ client/public/index.html
client/tsconfig.json

docker-compose.yml
.eslintrc.js
.eslintrc.js
tsconfig.json
71 changes: 70 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 7 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,23 @@
"version": "1.0.0",
"scripts": {
"lint": "npx eslint .",
"test": "cd scylla-server && npm run test",
"prettier-check": "npx prettier --check .",
"install-dependencies": "npm install && cd scylla-server && npm install && cd ../client && npm install",
"build": "cd scylla-server && npm run build && cd ../client && npm run build",
"start:production": "cd scylla-server && npm run start:production && cd ../client && npm run start:production",
"prisma:generate": "cd scylla-server && npm run prisma:generate"
"prisma:generate": "cd scylla-server && npm run prisma:generate",
"prisma:migrate": "cd scylla-server && npm run prisma:migrate"
},
"author": "",
"license": "ISC",
"dev-dependencies": {
"prettier": "^3.0.3",
"eslint": "^7.0.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-prettier": "^4.2.1"
},
"devDependencies": {
"prettier": "^3.0.3",
"@typescript-eslint/eslint-plugin": "^6.7.0",
"eslint": "^8.49.0",
"eslint-config-react-app": "^7.0.1",
"eslint-plugin-react": "^7.33.2"
"eslint-plugin-react": "^7.33.2",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-prettier": "^4.2.1"
}
}
Loading

0 comments on commit f8cbfb2

Please sign in to comment.