From 77b880f8b6eeb0d86c9c73d1c5a48fc931973501 Mon Sep 17 00:00:00 2001 From: s-xix98 <77755127+s-xix98@users.noreply.github.com> Date: Tue, 30 May 2023 12:38:41 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=AB?= =?UTF-8?q?=E6=99=82=E9=96=93=E3=81=8C=E3=81=8B=E3=81=8B=E3=82=8Atle?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82=E3=82=8B?= =?UTF-8?q?=E3=81=AE=E3=81=A7=E3=82=BF=E3=82=A4=E3=83=A0=E3=82=A2=E3=82=A6?= =?UTF-8?q?=E3=83=88=E3=81=BE=E3=81=A7=E3=81=AE=E6=99=82=E9=96=93=E4=BC=B8?= =?UTF-8?q?=E3=81=B0=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/storybook-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/storybook-test.yml b/.github/workflows/storybook-test.yml index 89075d194..079f1a26b 100644 --- a/.github/workflows/storybook-test.yml +++ b/.github/workflows/storybook-test.yml @@ -25,7 +25,7 @@ env: jobs: storybook-test: - timeout-minutes: 5 + timeout-minutes: 10 runs-on: ubuntu-latest services: postgres: From 2289ea23c1f1466a3e1999c4d32223d88afcada3 Mon Sep 17 00:00:00 2001 From: wyoheiii Date: Wed, 31 May 2023 03:04:32 +0900 Subject: [PATCH 2/2] =?UTF-8?q?make=E6=99=82=E3=81=ABprismaClient=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 69033baad..6e998856d 100644 --- 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