Fix --directory being passed to tsc

RocketChat · Apr 7, 2022 · dfad208 · dfad208
1 parent ef40dfc
commit dfad208
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 68 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -60,14 +60,13 @@ jobs:
           path: /home/runner/.cache/Cypress
           key: ${{ runner.OS }}-cache-cypress-${{ hashFiles('**/package-lock.json', '.github/workflows/build_and_test.yml') }}
 
-      # - name: Cache node modules
-      #   id: cache-nodemodules
-      #   uses: actions/cache@v2
-      #   with:
-      #     path: |
-      #       ./node_modules
-      #       ./ee/server/services/node_modules
-      #     key: ${{ runner.OS }}-node_modules-4-${{ hashFiles('**/package-lock.json', '.github/workflows/build_and_test.yml') }}
+      - name: Cache node modules
+        id: cache-nodemodules
+        uses: actions/cache@v2
+        with:
+          path: |
+            ./node_modules
+          key: ${{ runner.OS }}-node_modules-${{ hashFiles('**/yarn.lock', '.github/workflows/build_and_test.yml') }}
 
       # TODO change to use turbo cache
       - name: Cache meteor local
@@ -140,12 +139,12 @@ jobs:
         env:
           METEOR_PROFILE: 1000
         run: |
-          yarn build -- --debug --directory /tmp/build-test
+          yarn build:ci -- --debug --directory /tmp/build-test
 
       - name: Build Rocket.Chat
         if: startsWith(github.ref, 'refs/pull/') != true
         run: |
-          yarn build --directory /tmp/build-test
+          yarn build:ci --directory /tmp/build-test
 
       - name: Prepare build
         run: |
@@ -503,7 +502,7 @@ jobs:
       #     git checkout -- server/main.ts client/main.ts .meteor/packages
 
       - name: Build Rocket.Chat
-        run: yarn build -- --directory /tmp/build-pr
+        run: yarn build:ci -- --directory /tmp/build-pr
 
       - name: Build Docker image for PRs
         run: |

diff --git a/apps/meteor/package.json b/apps/meteor/package.json
@@ -13,7 +13,7 @@
 	],
 	"scripts": {
 		"start": "meteor",
-		"build": "meteor build --server-only",
+		"build:ci": "meteor build --server-only",
 		"dev": "meteor",
 		"ha": "meteor npm run ha:start",
 		"ha:start": "ts-node .scripts/run-ha.ts main",

diff --git a/package.json b/package.json
@@ -1,37 +1,38 @@
 {
-  "name": "rocket.chat",
-  "version": "4.7.0-develop",
-  "description": "Rocket.Chat Monorepo",
-  "main": "index.js",
-  "private": true,
-  "scripts": {
-    "postinstall": "husky install",
-    "build": "turbo run build",
-    "testunit": "turbo run testunit",
-    "dev": "turbo run dev --parallel",
-    "lint": "turbo run lint"
-  },
-  "devDependencies": {
-    "husky": "^7.0.1",
-    "turbo": "latest"
-  },
-  "workspaces": [
-    "apps/*",
-    "packages/*"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/RocketChat/Rocket.Chat.git"
-  },
-  "author": "",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/RocketChat/Rocket.Chat/issues"
-  },
-  "homepage": "https://github.com/RocketChat/Rocket.Chat#readme",
-  "engines": {
-    "npm": ">=7.0.0",
-    "node": ">=14.0.0"
-  },
-  "packageManager": "yarn@3.2.0"
+	"name": "rocket.chat",
+	"version": "4.7.0-develop",
+	"description": "Rocket.Chat Monorepo",
+	"main": "index.js",
+	"private": true,
+	"scripts": {
+		"postinstall": "husky install",
+		"build": "turbo run build",
+		"build:ci": "turbo run build:ci",
+		"testunit": "turbo run testunit",
+		"dev": "turbo run dev --parallel",
+		"lint": "turbo run lint"
+	},
+	"devDependencies": {
+		"husky": "^7.0.1",
+		"turbo": "latest"
+	},
+	"workspaces": [
+		"apps/*",
+		"packages/*"
+	],
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/RocketChat/Rocket.Chat.git"
+	},
+	"author": "",
+	"license": "MIT",
+	"bugs": {
+		"url": "https://github.com/RocketChat/Rocket.Chat/issues"
+	},
+	"homepage": "https://github.com/RocketChat/Rocket.Chat#readme",
+	"engines": {
+		"npm": ">=7.0.0",
+		"node": ">=14.0.0"
+	},
+	"packageManager": "yarn@3.2.0"
 }
diff --git a/turbo.json b/turbo.json
@@ -1,24 +1,30 @@
 {
 	"$schema": "https://turborepo.org/schema.json",
-  "pipeline": {
-    "build": {
-      "dependsOn": ["^build"],
-      "outputs": ["dist/**"]
-    },
-    "testunit": {
-      "outputs": []
-    },
-    "lint": {
-      "outputs": []
-    },
-    "translation-check": {
-      "outputs": []
-    },
-    "typecheck": {
-      "outputs": []
-    },
-    "dev": {
-      "cache": false
-    }
-  }
+	"pipeline": {
+		"build:ci": {
+			"dependsOn": ["^build"],
+			"outputs": ["dist/**"]
+		},
+		"build": {
+			"dependsOn": ["^build"],
+			"outputs": ["dist/**"]
+		},
+		"testunit": {
+			"outputs": []
+		},
+		"lint": {
+			"dependsOn": ["build"],
+			"outputs": []
+		},
+		"translation-check": {
+			"outputs": []
+		},
+		"typecheck": {
+			"dependsOn": ["build"],
+			"outputs": []
+		},
+		"dev": {
+			"cache": false
+		}
+	}
 }