diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh index 6644dc979..460a2a8c4 100755 --- a/.devcontainer/postCreate.sh +++ b/.devcontainer/postCreate.sh @@ -2,5 +2,4 @@ corepack enable yarn yarn build:wasm -yarn prisma:generate yarn sdks base diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 2b5fc5c08..d4eb0f2f7 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -19,8 +19,7 @@ jobs: - name: Setup yarn run: | corepack enable - yarn --immutable --mode=skip-build - yarn prisma:generate + yarn --immutable - name: Run ESLint run: yarn workspaces foreach -Apv -j unlimited run lint typecheck: @@ -39,7 +38,6 @@ jobs: - name: Setup yarn run: | corepack enable - yarn --immutable --mode=skip-build - yarn prisma:generate + yarn --immutable - name: Run TypeScript run: yarn workspaces foreach -Apv -j unlimited run typecheck diff --git a/docker/Dockerfile-ci b/docker/Dockerfile-ci index 7eb40051b..3f662cd5d 100644 --- a/docker/Dockerfile-ci +++ b/docker/Dockerfile-ci @@ -44,6 +44,7 @@ WORKDIR /workdir # Copy files required for installing dependencies COPY cache/yarn ./cache/yarn +COPY packages/backend/prisma ./packages/backend/prisma # Install dependencies RUN \ @@ -57,15 +58,6 @@ RUN \ corepack enable && \ yarn workspaces focus -A --production -# Generate Prisma client -COPY packages/backend/prisma ./packages/backend/prisma -RUN \ - --mount=type=bind,source=package.json,target=package.json \ - --mount=type=bind,source=.yarnrc.yml,target=.yarnrc.yml \ - --mount=type=bind,source=yarn.lock,target=yarn.lock \ - --mount=type=bind,source=packages/backend/package.json,target=packages/backend/package.json \ - yarn prisma:generate - FROM node:21.2.0-alpine as test ENV FORCE_COLOR true diff --git a/packages/backend/package.json b/packages/backend/package.json index 31d291942..4207d5d2f 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -21,7 +21,8 @@ "build:logFormatterConfig": "esbuild src/utils/logFormatterConfig.ts --bundle --minify --platform=node --format=cjs --legal-comments=none --log-override:commonjs-variable-in-esm=silent --outfile=dist/pino-pretty-config.cjs", "typecheck": "tsc --noEmit --tsBuildInfoFile $HOME/.cache/rating-tracker/backend.tsbuildinfo", "lint": "eslint --color --cache --cache-location $HOME/.cache/rating-tracker/backend.eslintcache --cache-strategy content --max-warnings 0 --ext .ts src/ test/", - "lint:fix": "yarn lint --fix" + "lint:fix": "yarn lint --fix", + "postinstall": "yarn prisma:generate" }, "dependencies": { "@prisma/client": "5.6.0",