diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml index 12cbe283a..71f9e576e 100644 --- a/.github/workflows/container-build.yml +++ b/.github/workflows/container-build.yml @@ -69,6 +69,7 @@ jobs: type=raw,value=latest,enable={{is_default_branch}} - name: Build and push Docker image + id: build uses: docker/build-push-action@v6 with: context: ${{ matrix.context }} diff --git a/dbal/shared/tools/codegen/generate-types.ts b/dbal/shared/tools/codegen/generate-types.ts index ed2a673ad..101a276e4 100644 --- a/dbal/shared/tools/codegen/generate-types.ts +++ b/dbal/shared/tools/codegen/generate-types.ts @@ -133,8 +133,8 @@ function generateAllTypes(): string { const content = fs.readFileSync(file, 'utf-8') // Check if file contains multiple documents (separated by ---) - // Match document separator at start of line - if (/\n---\s*\n/.test(content)) { + // Match document separator: --- on its own line + if (/(?:^|\n)---\s*(?:\n|$)/.test(content)) { // Parse all documents in the file const docs = yaml.parseAllDocuments(content) for (const doc of docs) { diff --git a/frontends/nextjs/Dockerfile b/frontends/nextjs/Dockerfile index 35d1b28b6..fde78a0fc 100644 --- a/frontends/nextjs/Dockerfile +++ b/frontends/nextjs/Dockerfile @@ -12,7 +12,7 @@ RUN apk add --no-cache libc6-compat COPY package*.json ./ COPY frontends/nextjs/package*.json ./frontends/nextjs/ COPY dbal/development/package*.json ./dbal/development/ -COPY config/package*.json ./config/ 2>/dev/null || true +COPY config/package*.json ./config/ # Install dependencies RUN npm ci @@ -64,7 +64,7 @@ COPY --from=builder /app/frontends/nextjs/public ./public COPY --from=builder /app/frontends/nextjs/.next/standalone ./ COPY --from=builder /app/frontends/nextjs/.next/static ./.next/static -# Copy Prisma schema and generated client +# Copy Prisma schema and generated client from workspace root COPY --from=builder /app/prisma ./prisma COPY --from=builder /app/node_modules/.prisma ./node_modules/.prisma COPY --from=builder /app/node_modules/@prisma ./node_modules/@prisma