Merge branch 'main' into 221-ユーザーをクリックらそのユーザーの情報をモーダルウィンドウ的なので表示させるます

s-xix98 · May 30, 2023 · c8d04eb · c8d04eb
2 parents 3f5953d + 8cd1926
commit c8d04eb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/storybook-test.yml b/.github/workflows/storybook-test.yml
@@ -19,7 +19,7 @@ env:
 
 jobs:
   storybook-test:
-    timeout-minutes: 5
+    timeout-minutes: 10
     runs-on: ubuntu-latest
     services:
       postgres:

diff --git a/Makefile b/Makefile
@@ -9,6 +9,7 @@ DOCKER_BUILD_TXT	:=	.docker_build
 PHONY	:=	all
 all: $(DOCKER_BUILD_TXT)
 	$(MAKE) local-npm-i
+	$(MAKE) local-prisma-generate
 	docker compose up
 
 $(DOCKER_BUILD_TXT): $(DOCKER_FILES)
@@ -20,6 +21,10 @@ local-npm-i:
 	cd frontend && npm i
 	cd backend && npm i
 
+PHONY	+=	local-prisma-generate
+local-prisma-generate:
+	cd backend && npx prisma generate
+
 PHONY	+=	down
 down:
 	docker compose down