From 4f53c08ea0efb0dd64ea06beac703a8e4f1b3dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerg=C5=91=20Jedlicska?= Date: Tue, 5 Apr 2022 13:51:51 +0200 Subject: [PATCH 1/6] ci(pre-commit): add pre-commit ci badge --- packages/server/readme.md | 1 + 1 file changed, 1 insertion(+) 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 From eccc62745224661c783cb82407948c7fd79a737f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerg=C5=91=20Jedlicska?= Date: Tue, 5 Apr 2022 14:57:57 +0200 Subject: [PATCH 2/6] ci(pre-commit ci): add eslint extra dependencies --- .pre-commit-config.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e64fad2bc..59378e970 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,6 +5,10 @@ repos: - id: eslint # files: \.[jt]sx?$ # *.js, *.jsx, *.ts and *.tsx # types: [file] + additional_dependencies: + - 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: From 6e673789ecd53729c810207ba9cc52886016511a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerg=C5=91=20Jedlicska?= Date: Tue, 5 Apr 2022 15:04:03 +0200 Subject: [PATCH 3/6] test(server test): remove to short timeout from rest tests --- packages/server/modules/core/tests/rest.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 3c571a2274a73326dc9a27201e684928fe97b107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerg=C5=91=20Jedlicska?= Date: Tue, 5 Apr 2022 15:06:35 +0200 Subject: [PATCH 4/6] ci(pre-commit ci): add eslint as dependenency --- .pre-commit-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 59378e970..ff50865af 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,6 +6,7 @@ repos: # 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 From a7d9cb29a1935d0cff3e67b93fdf305b0c62f167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerg=C5=91=20Jedlicska?= Date: Tue, 5 Apr 2022 15:35:33 +0200 Subject: [PATCH 5/6] ci(circle ci): remove linting from circle ci since its moved to pre-commit ci --- .circleci/config.yml | 12 ------------ 1 file changed, 12 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: From 53caa1803569174e130ad3b091ec60937a7246be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerg=C5=91=20Jedlicska?= Date: Tue, 5 Apr 2022 18:41:19 +0200 Subject: [PATCH 6/6] docs(readme): add pre-commit badge to top level readme --- readme.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 1eba64949..d55f5315a 100644 --- a/readme.md +++ b/readme.md @@ -8,7 +8,17 @@

Speckle is data infrastructure for the AEC industry.


Twitter Follow Community forum users website docs

-

Speckle-Next codecov

+ +

+Speckle-Next + + +codecov + + +codecov + +

# About Speckle