Cirrus - Avoid runing eslint 2 times on CI

diff --git a/server/sonar-docs/build.gradle b/server/sonar-docs/build.gradle
index 73b8598d1886d164305472b759a52d53c7e81064..088b00bb2698de9b8ad83ce500545ad046ae0c6e 100644 (file)
--- a/server/sonar-docs/build.gradle
+++ b/server/sonar-docs/build.gradle
@@ -18,9 +18,10 @@ yarn_run {
   args = ['build']
 }
 
-task yarn_validate() {
+task yarn_validate_ci() {
 
 }
+
 task "yarn_lint-report"() {
 
 }

diff --git a/server/sonar-vsts/package.json b/server/sonar-vsts/package.json
index 1675be0ffa2e136e3ad13cc0a0b705f24220c9a3..e5ec1196ec40f6a516ba2e427568a91815c801fc 100644 (file)
--- a/server/sonar-vsts/package.json
+++ b/server/sonar-vsts/package.json
@@ -72,11 +72,12 @@
     "build": "node scripts/build.js",
     "test": "jest --passWithNoTests",
     "format": "prettier --write --list-different 'src/main/js/!(libs)/**/*.{js,ts,tsx,css}'",
+    "format-check": "prettier --list-different 'src/main/js/!(libs)/**/*.{js,ts,tsx,css}'",
     "lint": "eslint --ext js,ts,tsx --quiet src/main/js",
     "lint-report": "eslint --ext js,ts,tsx -f json -o eslint-report.json src/main/js",
     "ts-check": "tsc --noEmit",
-    "prettier-check": "prettier --list-different 'src/main/js/!(libs)/**/*.{js,ts,tsx,css}'",
-    "validate": "yarn lint && yarn ts-check && yarn prettier-check && yarn test"
+    "validate": "yarn lint && yarn ts-check && yarn format-check && yarn test",
+    "validate-ci": "yarn lint-report && yarn ts-check && yarn format-check && yarn test"
   },
   "engines": {
     "node": ">=6"

diff --git a/server/sonar-web/package.json b/server/sonar-web/package.json
index 1ff33ce42dab5198942580dab1e5e21bf016b58f..f8bcb27794b8cd283652da72659b40b92b603a40 100644 (file)
--- a/server/sonar-web/package.json
+++ b/server/sonar-web/package.json
@@ -128,14 +128,15 @@
   "scripts": {
     "start": "node scripts/start.js",
     "build": "node scripts/build.js",
-    "build-fast": "node scripts/build.js --fast",
     "test": "jest",
     "format": "prettier --write --list-different 'src/main/js/**/*.{js,ts,tsx,css}'",
+    "format-check": "yarn prettier --list-different 'src/main/js/**/*.{js,ts,tsx,css}'",
     "lint": "eslint --ext js,ts,tsx --quiet src/main/js",
     "lint-report": "eslint --ext js,ts,tsx -f json -o eslint-report.json src/main/js",
     "flow-check": "flow check src/main/js",
     "ts-check": "tsc --noEmit",
-    "validate": "yarn lint && yarn flow-check && yarn ts-check && yarn test",
+    "validate": "yarn lint && yarn flow-check && yarn ts-check && yarn format-check && yarn test",
+    "validate-ci": "yarn lint-report && yarn flow-check && yarn ts-check && yarn format-check && yarn test",
     "precommit": "yarn ts-check && lint-staged && yarn flow-check"
   },
   "engines": {

diff --git a/server/sonar-web/src/main/js/apps/settings/store/encryptionPage/actions.js b/server/sonar-web/src/main/js/apps/settings/store/encryptionPage/actions.js
index f20e9e91c9060d46a8e2df2e09dda42244d83d02..a8123a69c84a6f198be70dd29e7fb23864bc0749 100644 (file)
--- a/server/sonar-web/src/main/js/apps/settings/store/encryptionPage/actions.js
+++ b/server/sonar-web/src/main/js/apps/settings/store/encryptionPage/actions.js
@@ -19,10 +19,7 @@
  */
 import * as api from '../../../../api/settings';
 import { parseError } from '../../../../helpers/request';
-import {
-  addGlobalErrorMessage,
-  closeAllGlobalMessages
-} from '../../../../store/globalMessages';
+import { addGlobalErrorMessage, closeAllGlobalMessages } from '../../../../store/globalMessages';
 
 export const UPDATE_ENCRYPTION = 'UPDATE_ENCRYPTION';