From: Wouter Admiraal <wouter.admiraal@sonarsource.com>
Date: Tue, 30 Nov 2021 11:11:12 +0000 (+0100)
Subject: [NO JIRA] Simplify sonar-docs build, as it's not analyzed in SonarQube
X-Git-Tag: 9.3.0.51899~149
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3a80d2056bab7773658fcbcd00c9b2b8d2e4ba77;p=sonarqube.git

[NO JIRA] Simplify sonar-docs build, as it's not analyzed in SonarQube

Right now, we're not analyzing anything in server/sonar-docs. This means
running things like coverage, JUnit reports, or ESLint, is meaningless,
as the analysis will never be able to link the results to any known
files.
---

diff --git a/.cirrus.yml b/.cirrus.yml
index 40c9fbd680e..e35f03c7caf 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -117,7 +117,6 @@ eslint_report_cache_template: &ESLINT_REPORT_CACHE_TEMPLATE
   eslint_report_cache:
     folders:
       - server/sonar-web/eslint-report/
-      - server/sonar-docs/eslint-report/
       - private/core-extension-securityreport/eslint-report/
       - private/core-extension-license/eslint-report/
       - private/core-extension-governance/eslint-report/
@@ -127,7 +126,6 @@ jest_report_cache_template: &JEST_REPORT_CACHE_TEMPLATE
   jest_report_cache:
     folders:
       - server/sonar-web/coverage/
-      - server/sonar-docs/coverage/
       - private/core-extension-securityreport/coverage/
       - private/core-extension-license/coverage/
       - private/core-extension-governance/coverage/
diff --git a/server/sonar-docs/build.gradle b/server/sonar-docs/build.gradle
index f30f4108698..e2aeb66bee4 100644
--- a/server/sonar-docs/build.gradle
+++ b/server/sonar-docs/build.gradle
@@ -87,20 +87,6 @@ task "yarn_check-ci"(type: Exec) {
   commandLine osAdaptiveCommand(['npm', 'run', 'check-ci'])
 }
 
-task "yarn_lint-report-ci"(type: Exec) {
-  // Note that outputs are not relocatable, because contain absolute paths, and that's why inputs are not relativized
-  ['config', 'src'].each {
-    inputs.dir(it)
-  }
-  ['package.json', 'yarn.lock', 'tsconfig.json', '.eslintrc'].each {
-    inputs.file(it)
-  }
-  outputs.dir('eslint-report')
-  outputs.cacheIf { true }
-
-  commandLine osAdaptiveCommand(['npm', 'run', 'lint-report-ci'])
-}
-
 task "yarn_validate-ci"(type: Exec) {
   // Note that outputs are not relocatable, because contain absolute paths, and that's why inputs are not relativized
   ['config', 'src'].each {
@@ -109,7 +95,6 @@ task "yarn_validate-ci"(type: Exec) {
   ['package.json', 'yarn.lock', 'tsconfig.json', '.eslintrc'].each {
     inputs.file(it)
   }
-  outputs.dir('coverage')
   outputs.cacheIf { true }
 
   commandLine osAdaptiveCommand(['npm', 'run', 'validate-ci'])
diff --git a/server/sonar-docs/package.json b/server/sonar-docs/package.json
index e1907bb4cbb..e8a80e609d1 100644
--- a/server/sonar-docs/package.json
+++ b/server/sonar-docs/package.json
@@ -55,7 +55,6 @@
     "graphql-code-generator": "0.5.2",
     "jest": "25.1.0",
     "jest-fetch-mock": "2.1.2",
-    "jest-junit": "12.0.0",
     "prettier": "1.19.1",
     "react-test-renderer": "16.8.5",
     "remark": "11.0.2",
@@ -71,11 +70,9 @@
     "format": "prettier --write --list-different \"src/**/*.{js,ts,tsx,css}\"",
     "format-check": "prettier --list-different \"src/**/*.{js,ts,tsx,css}\"",
     "lint": "eslint --ext js,ts,tsx --quiet src",
-    "lint-report": "eslint --ext js,ts,tsx -f json -o eslint-report/eslint-report.json src",
-    "lint-report-ci": "yarn install --immutable && eslint --ext js,ts,tsx -f json -o eslint-report/eslint-report.json src",
     "ts-check": "tsc --noEmit",
     "validate": "yarn lint && yarn ts-check && yarn format-check && yarn test",
-    "validate-ci": "yarn install --immutable && yarn test --coverage --ci --reporters=default --reporters=jest-junit",
+    "validate-ci": "yarn install --immutable && yarn test --ci",
     "check-ci": "yarn install --immutable && yarn ts-check && yarn format-check",
     "audit-ci": "yarn npm audit --environment production --severity high"
   },
@@ -113,13 +110,5 @@
       "\\.(ts|tsx)$": "ts-jest"
     }
   },
-  "jest-junit": {
-    "outputDirectory": "build/test-results/test-jest",
-    "outputName": "junit.xml",
-    "ancestorSeparator": " > ",
-    "suiteNameTemplate": "{filename}",
-    "classNameTemplate": "{classname}",
-    "titleTemplate": "{title}"
-  },
   "packageManager": "yarn@3.0.2"
-}
+}
\ No newline at end of file
diff --git a/server/sonar-docs/yarn.lock b/server/sonar-docs/yarn.lock
index 099546438f7..5fd88ffe108 100644
--- a/server/sonar-docs/yarn.lock
+++ b/server/sonar-docs/yarn.lock
@@ -11750,18 +11750,6 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"jest-junit@npm:12.0.0":
-  version: 12.0.0
-  resolution: "jest-junit@npm:12.0.0"
-  dependencies:
-    mkdirp: ^1.0.4
-    strip-ansi: ^5.2.0
-    uuid: ^3.3.3
-    xml: ^1.0.1
-  checksum: 8b3e2bd35a0e928b15ae46e5d3815da885830cc110bd532ee0bef8a7d9917bfbf05a66a06d2bb0848852b161e8526cebf98eda57985b6f76e9fa183ec9693de7
-  languageName: node
-  linkType: hard
-
 "jest-leak-detector@npm:^25.1.0":
   version: 25.1.0
   resolution: "jest-leak-detector@npm:25.1.0"
@@ -17837,7 +17825,6 @@ resolve@1.1.7:
     hast-util-select: 4.0.0
     jest: 25.1.0
     jest-fetch-mock: 2.1.2
-    jest-junit: 12.0.0
     lodash: 4.17.21
     lunr: 2.3.8
     prettier: 1.19.1
@@ -19703,7 +19690,7 @@ typescript@4.1.3:
   languageName: node
   linkType: hard
 
-"uuid@npm:3.4.0, uuid@npm:^3.3.3, uuid@npm:^3.4.0":
+"uuid@npm:3.4.0, uuid@npm:^3.4.0":
   version: 3.4.0
   resolution: "uuid@npm:3.4.0"
   bin:
@@ -20383,13 +20370,6 @@ typescript@4.1.3:
   languageName: node
   linkType: hard
 
-"xml@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "xml@npm:1.0.1"
-  checksum: 11b5545ef3f8fec3fa29ce251f50ad7b6c97c103ed4d851306ec23366f5fa4699dd6a942262df52313a0cd1840ab26256da253c023bad3309d8ce46fe6020ca0
-  languageName: node
-  linkType: hard
-
 "xmlchars@npm:^2.1.1":
   version: 2.2.0
   resolution: "xmlchars@npm:2.2.0"