ci: simplify linting in ci (#2072)

* ci: simplify linting in ci * ci: simplify linting in ci * Update Semaphore configuration Co-authored-by: Daniel Kantor <[email protected]>
kantord · Mar 15, 2022 · fa0aaa8 · fa0aaa8
1 parent 7719096
commit fa0aaa8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 24 deletions.
diff --git a/.semaphore/pipeline_2.yml b/.semaphore/pipeline_2.yml
@@ -36,5 +36,4 @@ blocks:
             - checkout
             - cache restore website-build-$SEMAPHORE_GIT_PR_SHA
             - apps/librelingo-standalone-server/build.sh __sapper__/export/ binaries/
-            - artifact push project --force binaries      
-
+            - artifact push project --force binaries
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
@@ -26,19 +26,18 @@ blocks:
   - name: Jest
     task:
       jobs:
-        - name: jest
+        - name: yarn jest
           commands:
             - sem-version node 14
             - checkout
             - cache restore node-$(checksum yarn.lock)
             - yarn jest
     dependencies:
-      - Eslint
+      - JavaScript Linting
   - name: Cypress
     task:
       jobs:
-        - name: cypress
-          # parallelism: 2
+        - name: cypress and percy
           commands:
             - sem-version node 14
             - checkout
@@ -48,41 +47,29 @@ blocks:
             - cache restore sapper-build-$SEMAPHORE_GIT_SHA
             - yarn install
             - find ./apps/web/src
-            # - SEMAPHORE_BUILD_NUMBER=$SEMAPHORE_PIPELINE_ID SEMAPHORE_THREAD_COUNT=3 yarn test:ci
-            - yarn test:ci
+            - 'yarn test:ci'
       secrets:
         - name: Percy token
         - name: KnapsackPro token
     dependencies:
       - Sapper static build
-  - name: Eslint
+  - name: JavaScript Linting
     dependencies:
       - Set up dependencies
     task:
       jobs:
-        - name: eslint
-          commands:
-            - sem-version node 14
-            - checkout
-            - cache restore node-$(checksum yarn.lock)
-            - yarn lint
-  - name: Eslint Cypress
-    dependencies:
-      - Set up dependencies
-    task:
-      jobs:
-        - name: eslint
+        - name: yarn lint
           commands:
             - sem-version node 14
             - checkout
             - cache restore node-$(checksum yarn.lock)
             - yarn lint
   - name: TypeScript check
     dependencies:
-      - Eslint
+      - Jest
     task:
       jobs:
-        - name: tsc
+        - name: yarn types
           commands:
             - sem-version node 14
             - checkout
@@ -91,7 +78,7 @@ blocks:
             - yarn types
   - name: Sapper static build
     dependencies:
-      - Eslint Cypress
+      - Set up dependencies
     task:
       jobs:
         - name: yarn web export