From 0bb5ae5a020f0ecf7aa98637cd3e8ab9336b59ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerg=C5=91=20Jedlicska?=
 <57442769+gjedlicska@users.noreply.github.com>
Date: Tue, 5 Apr 2022 16:18:17 +0200
Subject: [PATCH] ci(pre-commit): add pre-commit ci badge (#664)

* ci(pre-commit): add pre-commit ci badge

* ci(pre-commit ci): add eslint extra dependencies

* test(server test): remove to short timeout from rest tests

* ci(pre-commit ci): add eslint as dependenency

* ci(circle ci): remove linting from circle ci since its moved to pre-commit ci
---
 .circleci/config.yml                            | 12 ------------
 .pre-commit-config.yaml                         |  5 +++++
 packages/server/modules/core/tests/rest.spec.js |  2 +-
 packages/server/readme.md                       |  1 +
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d961a53b0..bfd616505 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,7 +9,6 @@ workflows:
   test-build:
     jobs:
       - test-server
-      - lint
       - get-version:
           filters: &filters-build
             tags:
@@ -20,8 +19,6 @@ workflows:
 
       # - build-viewer:
       #     # built the npm package
-      #     requires:
-      #       - lint
       #     filters: &filters-build
       #       tags:
       #         only: /^[0-9]+\.[0-9]+\.[0-9]+$/
@@ -38,7 +35,6 @@ workflows:
           context: &docker-hub-context
             - docker-hub
           requires:
-            - lint
             - test-server
             - get-version
 
@@ -46,14 +42,12 @@ workflows:
           context: *docker-hub-context
           filters: *filters-build
           requires:
-            - lint
             - get-version
 
       - docker-build-and-publish-webhooks:
           context: *docker-hub-context
           filters: *filters-build
           requires:
-            - lint
             - get-version
             - test-server
 
@@ -61,7 +55,6 @@ workflows:
           context: *docker-hub-context
           filters: *filters-build
           requires:
-            - lint
             - get-version
             - test-server
 
@@ -69,7 +62,6 @@ workflows:
           context: *docker-hub-context
           filters: *filters-build
           requires:
-            - lint
             - get-version
             - test-server
 
@@ -77,14 +69,12 @@ workflows:
           context: *docker-hub-context
           filters: *filters-build
           requires:
-            - lint
             - get-version
             - test-server
 
       - publish-helm-chart:
           filters: *filters-build
           requires:
-            - lint
             - test-server
             - get-version
             - docker-build-and-publish-server
@@ -96,8 +86,6 @@ workflows:
 
       - publish-npm:
           filters: *filters-build
-          requires:
-            - lint
 
 jobs:
   lint:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e64fad2bc..ff50865af 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,6 +5,11 @@ repos:
       - id: eslint
         # files: \.[jt]sx?$ # *.js, *.jsx, *.ts and *.tsx
         # types: [file]
+        additional_dependencies:
+          - eslint@8.11.0
+          - eslint-config-prettier@8.5.0
+          - eslint-plugin-vue@8.5.0
+
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: 'v2.5.1' # Use the sha / tag you want to point at
     hooks:
diff --git a/packages/server/modules/core/tests/rest.spec.js b/packages/server/modules/core/tests/rest.spec.js
index 5c561d9c5..f2a1f1b6a 100644
--- a/packages/server/modules/core/tests/rest.spec.js
+++ b/packages/server/modules/core/tests/rest.spec.js
@@ -226,7 +226,7 @@ describe('Upload/Download Routes @api-rest', () => {
             }
           })
       })
-  }).timeout(5000)
+  })
 
   it('Should properly download an object, with all its children, into a text/plain response', (done) => {
     request(app)
diff --git a/packages/server/readme.md b/packages/server/readme.md
index 24dfc66eb..0c124a3a9 100644
--- a/packages/server/readme.md
+++ b/packages/server/readme.md
@@ -5,6 +5,7 @@
 #### Status
 
 [![Speckle-Next](https://circleci.com/gh/specklesystems/speckle-server.svg?style=svg&circle-token=76eabd350ea243575cbb258b746ed3f471f7ac29)](https://github.com/Speckle-Next/SpeckleServer/) [![codecov](https://codecov.io/gh/specklesystems/speckle-server/branch/master/graph/badge.svg)](https://codecov.io/gh/specklesystems/speckle-server)
+[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/specklesystems/speckle-server/main.svg)](https://results.pre-commit.ci/latest/github/specklesystems/speckle-server/main)
 
 ## Disclaimer