From 3d5d84e75cc175d919b6ada09781f51ed53ee92d Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Tue, 7 Oct 2025 21:02:24 -0400 Subject: [PATCH] run root build-pre from CI --- .gitlab-ci.yml | 11 ++--------- packages/backend/package.json | 2 +- packages/frontend-embed/package.json | 2 +- packages/frontend/package.json | 2 +- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36933c98af..2466e7637e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -128,10 +128,7 @@ backend_tests: - name: redis pull_policy: if-not-present script: - - pnpm run --filter misskey-js build - - pnpm run --filter misskey-bubble-game build - - pnpm run --filter misskey-reversi build - - pnpm run --filter megalodon build + - pnpm run --filter backend build:pre - pnpm run --filter backend build - pnpm run --filter backend migrate - pnpm run --filter backend test @@ -152,11 +149,7 @@ backend_tests: frontend_tests: <<: *test_common script: - - pnpm run --filter misskey-js build - - pnpm run --filter misskey-bubble-game build - - pnpm run --filter misskey-reversi build - - pnpm run --filter sw build - - pnpm run --filter frontend-shared build + - pnpm run --filter frontend build:pre - pnpm run --filter frontend build - pnpm run --filter frontend test # Same as common, but MRs are only run if they modify the frontend. diff --git a/packages/backend/package.json b/packages/backend/package.json index 90c0da934d..d00b4c1a51 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -16,7 +16,7 @@ "revert": "pnpm typeorm migration:revert -d ormconfig.js", "check:connect": "node ./scripts/check_connect.js", "build": "swc src -d built -D --strip-leading-paths", - "build:pre": "pnpm run --filter megalodon build && pnpm run --filter misskey-js build && pnpm run --filter misskey-reversi build && pnpm run --filter misskey-bubble-game build && pnpm run -w build-assets", + "build:pre": "pnpm run -w build-pre && pnpm run --filter megalodon build && pnpm run --filter misskey-js build && pnpm run --filter misskey-reversi build && pnpm run --filter misskey-bubble-game build && pnpm run -w build-assets", "build:test": "swc test-server -d built-test -D --config-file test-server/.swcrc --strip-leading-paths", "build:tsc": "tsc -p tsconfig.backend.json && tsc-alias -p tsconfig.backend.json", "watch": "pnpm run build:pre && node ./scripts/watch.mjs", diff --git a/packages/frontend-embed/package.json b/packages/frontend-embed/package.json index 7c04a60b80..57aa36d774 100644 --- a/packages/frontend-embed/package.json +++ b/packages/frontend-embed/package.json @@ -5,7 +5,7 @@ "scripts": { "watch": "node scripts/build.mjs --watch", "build": "node scripts/build.mjs", - "build:pre": "pnpm run --filter misskey-js build && pnpm run --filter sw build && pnpm run --filter frontend_shared build", + "build:pre": "pnpm run -w build-pre && pnpm run --filter misskey-js build && pnpm run --filter sw build && pnpm run --filter frontend_shared build", "typecheck-all": "pnpm run --no-bail typecheck:vue && pnpm run --no-bail typecheck:scripts", "typecheck": "pnpm run typecheck:vue && pnpm run typecheck:scripts", "typecheck:vue": "vue-tsc -p tsconfig.vue.json --noEmit", diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 911dff36c4..5ad0e5620b 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -5,7 +5,7 @@ "scripts": { "watch": "node scripts/build.mjs --watch", "build": "node scripts/build.mjs", - "build:pre": "pnpm run --filter misskey-js build && pnpm run --filter misskey-reversi build && pnpm run --filter misskey-bubble-game build && pnpm run --filter sw build && pnpm run --filter frontend_shared build", + "build:pre": "pnpm run -w build-pre && pnpm run --filter misskey-js build && pnpm run --filter misskey-reversi build && pnpm run --filter misskey-bubble-game build && pnpm run --filter sw build && pnpm run --filter frontend_shared build", "storybook-dev": "nodemon --verbose --watch src --ext \"mdx,ts,vue\" --ignore \"*.stories.ts\" --exec \"pnpm build-storybook-pre && pnpm exec storybook dev -p 6006 --ci\"", "build-storybook-pre": "(tsc -p .storybook || echo done.) && node .storybook/generate.js && node .storybook/preload-locale.js && node .storybook/preload-theme.js", "build-storybook": "pnpm build-storybook-pre && storybook build --webpack-stats-json storybook-static",