Merge branch 'dev' of https://github.com/Layers-of-Railways/bot into dev

Layers-of-Railways · Aug 28, 2023 · 7aac033 · 7aac033
2 parents 934f40e + a1618ac
commit 7aac033
Show file tree

Hide file tree

Showing 13 changed files with 101 additions and 100 deletions.
diff --git a/.env.example b/.env.example
@@ -1,4 +1,5 @@
 DISCORD_TOKEN=
+OWNER_ID=
 SAY_LOGS_CHANNEL=
 LOGS_CHANNEL=
 MAVEN_REPO=

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -2,7 +2,6 @@ name: Docker
 
 on:
     push:
-        branches: ['main']
 
 env:
     REGISTRY: ghcr.io

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -3,9 +3,7 @@ name: Lint
 on:
     workflow_dispatch:
     push:
-        branches: ['main']
     pull_request:
-        branches: ['main']
 
 jobs:
     lint:

diff --git a/package.json b/package.json
@@ -5,11 +5,12 @@
     "scripts": {
         "dev": "cross-env NODE_ENV=development tsx watch src/index.ts",
         "start": "prisma migrate deploy && tsx src/index.ts",
-        "lint": "tsc && eslint . && prettier --check ."
+        "lint": "tsc && eslint . && prettier --check .",
+        "lint:fix": "prettier --write ."
     },
     "dependencies": {
         "@discordjs/rest": "1.7.1",
-        "@prisma/client": "5.1.0",
+        "@prisma/client": "5.1.1",
         "colorette": "^2.0.20",
         "discord.js": "14.11.0",
         "express": "^4.18.2",
@@ -26,7 +27,7 @@
         "dotenv": "16.3.1",
         "eslint": "8.43.0",
         "prettier": "2.8.8",
-        "prisma": "^5.1.0",
+        "prisma": "^5.1.1",
         "ts-node": "^10.9.1",
         "typescript": "5.1.3"
     },

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml