Просмотр исходного кода

Merge pull request #9325 from weseek/support/pull-lfs-files-when-only-absense

support: Pull LFS files with turbo
Yuki Takei 1 год назад
Родитель
Сommit
6c1090443e

+ 0 - 1
.devcontainer/postCreateCommand.sh

@@ -15,5 +15,4 @@ eval "$(cat /home/vscode/.bashrc)"
 pnpm install turbo --global
 
 # Install dependencies
-git-lfs pull
 turbo run bootstrap

+ 4 - 3
.github/workflows/reusable-app-prod.yml

@@ -23,9 +23,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-      with:
-        # retrieve local font files
-        lfs: true
+
+    - name: Install Git LFS
+      run: |
+        git lfs install
 
     - uses: pnpm/action-setup@v4
 

+ 3 - 2
apps/app/package.json

@@ -14,11 +14,12 @@
     "server": "cross-env NODE_ENV=production node -r dotenv-flow/config dist/server/app.js",
     "server:ci": "pnpm run server --ci",
     "preserver": "cross-env NODE_ENV=production pnpm run migrate",
-    "styles-prebuilt": "vite build -c vite.styles-prebuilt.config.ts",
+    "pre:styles": "vite build -c vite.styles-prebuilt.config.ts",
+    "pre:lfs": "git lfs pull",
     "migrate": "node -r dotenv-flow/config node_modules/migrate-mongo/bin/migrate-mongo up -f config/migrate-mongo-config.js",
     "//// for development": "",
     "dev": "cross-env NODE_ENV=development nodemon --exec pnpm run ts-node --inspect src/server/app.ts",
-    "dev:styles-prebuilt": "pnpm run styles-prebuilt --mode dev",
+    "dev:pre:styles": "pnpm run pre:styles --mode dev",
     "dev:migrate-mongo": "cross-env NODE_ENV=development pnpm run ts-node node_modules/migrate-mongo/bin/migrate-mongo",
     "dev:migrate": "pnpm run dev:migrate:status > tmp/cache/migration-status.out && pnpm run dev:migrate:up",
     "dev:migrate:create": "pnpm run dev:migrate-mongo create -f config/migrate-mongo-config.js",

+ 10 - 6
apps/app/turbo.json

@@ -3,7 +3,7 @@
   "extends": ["//"],
   "tasks": {
 
-    "styles-prebuilt": {
+    "pre:styles": {
       "dependsOn": ["@growi/ui#build"],
       "outputs": ["src/styles/prebuilt/**"],
       "inputs": [
@@ -13,8 +13,12 @@
       ],
       "outputLogs": "new-only"
     },
+    "pre:lfs": {
+      "outputs": ["resource/fonts/**"],
+      "outputLogs": "new-only"
+    },
     "build": {
-      "dependsOn": ["^build", "styles-prebuilt"],
+      "dependsOn": ["^build", "pre:styles", "pre:lfs"],
       "outputs": [".next/**", "!.next/cache/**", "dist/**"],
       "inputs": [
         "next.config.js",
@@ -33,7 +37,7 @@
       "inputs": ["src/migrations/*.js"],
       "outputLogs": "new-only"
     },
-    "dev:styles-prebuilt": {
+    "dev:pre:styles": {
       "dependsOn": ["@growi/ui#dev"],
       "outputs": ["src/styles/prebuilt/**"],
       "inputs": [
@@ -45,18 +49,18 @@
       "outputLogs": "new-only"
     },
     "dev": {
-      "dependsOn": ["^dev", "dev:migrate", "dev:styles-prebuilt"],
+      "dependsOn": ["^dev", "dev:migrate", "dev:pre:styles", "pre:lfs"],
       "cache": false,
       "persistent": true
     },
 
     "launch-dev:ci": {
-      "dependsOn": ["^dev", "dev:styles-prebuilt"],
+      "dependsOn": ["^dev", "dev:pre:styles"],
       "cache": false
     },
 
     "lint": {
-      "dependsOn": ["^dev", "dev:styles-prebuilt"]
+      "dependsOn": ["^dev", "dev:pre:styles"]
     },
 
     "test": {