From 20da74b4a6a43d2a65ee4fe8bd2a81f0910e0674 Mon Sep 17 00:00:00 2001
From: zomars <zomars@me.com>
Date: Wed, 9 Feb 2022 15:37:50 -0700
Subject: [PATCH] Workflow updates

---
 .github/workflows/check-types.yml |  9 +++------
 .github/workflows/e2e.yml         |  1 +
 .github/workflows/lint.yml        |  3 ---
 package.json                      |  4 +++-
 turbo.json                        | 11 ++++++++---
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/check-types.yml b/.github/workflows/check-types.yml
index bd83603180..257f2ee74c 100644
--- a/.github/workflows/check-types.yml
+++ b/.github/workflows/check-types.yml
@@ -20,11 +20,8 @@ jobs:
           fetch-depth: 0
 
       - name: Use Node ${{ matrix.node }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node }}
-
-      - name: Install deps
-        uses: bahmutov/npm-install@v1
-
-      - run: yarn check-changed-files
+      - run: yarn
+      - run: tsc
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 39f91baca7..abfa24cf19 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -73,6 +73,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-
 
+      - run: cd apps/web
       - run: yarn prisma migrate deploy
       - run: yarn db-seed
       - run: yarn test
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 45c17cbdac..7685c1a2b9 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -22,6 +22,3 @@ jobs:
 
       - name: Lint
         run: yarn lint
-
-      - name: Type Checks
-        run: tsc
diff --git a/package.json b/package.json
index 99861d88c1..a99becaa37 100644
--- a/package.json
+++ b/package.json
@@ -10,8 +10,10 @@
     "build": "turbo run build",
     "clean": "turbo run clean && rm -rf node_modules",
     "dev": "turbo run dev --parallel",
+    "dx": "turbo run dx",
     "lint": "turbo run lint",
-    "format": "prettier --write \"**/*.{ts,tsx,md}\""
+    "format": "prettier --write \"**/*.{ts,tsx,md}\"",
+    "prepare": "husky install"
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "2.0.4",
diff --git a/turbo.json b/turbo.json
index c64ed34f4d..75a09d1601 100644
--- a/turbo.json
+++ b/turbo.json
@@ -1,4 +1,6 @@
 {
+  "baseBranch": "origin/main",
+  "globalDependencies": [".env"],
   "pipeline": {
     "build": {
       "dependsOn": ["^build"],
@@ -7,11 +9,14 @@
     "clean": {
       "cache": false
     },
-    "lint": {
-      "outputs": []
-    },
     "dev": {
       "cache": false
+    },
+    "dx": {
+      "cache": false
+    },
+    "lint": {
+      "outputs": []
     }
   }
 }