chore: split jest e2e tests and cleanup configuration

nrwl · Apr 30, 2024 · 51abb92 · 51abb92
1 parent b1f088b
commit 51abb92
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 50 deletions.
diff --git a/.github/workflows/ci_checks.yml b/.github/workflows/ci_checks.yml
@@ -24,7 +24,7 @@ jobs:
       - run: |
           npx nx-cloud start-ci-run \
             --distribute-on="3 linux-medium-js" \
-            --stop-agents-after="e2e"
+            --stop-agents-after="e2e-ci"
       - uses: browser-actions/setup-chrome@v1
       - run: chrome --version
       - name: Use Node.js ${{ env.node_version }}
@@ -41,7 +41,7 @@ jobs:
         env:
           NX_CLOUD_DISTRIBUTED_EXECUTION: false
       - run: yarn nx affected --t=lint,test,build --configuration=ci --exclude=nx-console --verbose
-      - run: yarn nx affected --t=e2e,e2e-ci --configuration=ci --exclude=nx-console --parallel=1 --verbose
+      - run: yarn nx affected --t=e2e-ci --exclude=nx-console --parallel=1 --verbose
   main-windows:
     name: Main Windows
     runs-on: windows-latest
@@ -81,5 +81,5 @@ jobs:
           cache: gradle
       # there's no need to check formatting & linting again on windows
       - run: yarn nx affected --t=test,build --configuration=ci --exclude=nx-console --verbose
-      - run: yarn nx affected --t=e2e,e2e-ci --configuration=ci --exclude=nx-console --parallel=1 --verbose
+      - run: yarn nx affected --t=e2e-local --exclude=nx-console --parallel=1 --verbose
         timeout-minutes: 45
diff --git a/apps/intellij/project.json b/apps/intellij/project.json
@@ -29,9 +29,6 @@
         "command": "node ./apps/intellij/run-gradle.js :apps:intellij:check"
       }
     },
-    "lint": {
-      "executor": "nx:noop"
-    },
     "x-lint": {
       "//": "Run inspections take a long time on the CI. Disable for now",
       "executor": "nx:run-commands",

diff --git a/apps/nxls-e2e/project.json b/apps/nxls-e2e/project.json
@@ -3,20 +3,7 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/nxls-e2e/src",
   "projectType": "application",
-  "targets": {
-    "test": {
-      "command": "jest --detectOpenHandles --runInBand --verbose",
-      "options": {
-        "cwd": "apps/nxls-e2e"
-      },
-      "dependsOn": [
-        {
-          "projects": "nxls",
-          "target": "build"
-        }
-      ]
-    }
-  },
+  "targets": {},
   "tags": ["type:lsp"],
   "implicitDependencies": ["nxls"]
 }
diff --git a/libs/generate-ui/styles/project.json b/libs/generate-ui/styles/project.json
@@ -3,11 +3,7 @@
   "$schema": "../../../node_modules/nx/schemas/project-schema.json",
   "projectType": "library",
   "sourceRoot": "libs/generate-ui/styles/src",
-  "targets": {
-    "lint": {
-      "executor": "nx:noop"
-    }
-  },
+  "targets": {},
   "generators": {},
   "tags": ["type:generate-ui"]
 }
diff --git a/nx.json b/nx.json
@@ -36,14 +36,6 @@
       "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
       "cache": true
     },
-    "lint": {
-      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
-      "cache": true
-    },
-    "e2e": {
-      "inputs": ["default", "^production"],
-      "cache": true
-    },
     "build-storybook": {
       "inputs": [
         "production",
@@ -60,23 +52,6 @@
     },
     "extract-dependencies": {
       "cache": true
-    },
-    "@nx/jest:jest": {
-      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
-      "cache": true,
-      "options": {
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
-      }
-    },
-    "@nx/eslint:lint": {
-      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
-      "cache": true
     }
   },
   "namedInputs": {
@@ -109,10 +84,19 @@
     },
     {
       "plugin": "@nx/jest/plugin",
+      "exclude": ["apps/nxls-e2e/**/*"],
       "options": {
         "targetName": "test"
       }
     },
+    {
+      "plugin": "@nx/jest/plugin",
+      "include": ["apps/nxls-e2e/**/*"],
+      "options": {
+        "targetName": "e2e-local",
+        "ciTargetName": "e2e-ci"
+      }
+    },
     {
       "plugin": "@nx/cypress/plugin",
       "options": {