Some more change to satisfy SQ quality gate

SonarSource · Nov 20, 2024 · 2a45729 · 2a45729
1 parent 74ebf5d
commit 2a45729
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -121,20 +121,24 @@ build_task:
     SONAR_TOKEN: VAULT[development/kv/data/next data.token]
     SONAR_HOST_URL: https://next.sonarqube.com/sonarqube
     ARTIFACTORY_DEPLOY_ACCESS_TOKEN: VAULT[development/artifactory/token/${CIRRUS_REPO_OWNER}-${CIRRUS_REPO_NAME}-qa-deployer access_token]
-  <<: *MAVEN_CACHE
-  <<: *RUNTIME_CACHE
-  <<: *NPMRC_SCRIPT_DEFINITION
   clone_script: |
-    git config --system core.longpaths true
     if [ -z "$CIRRUS_PR" ]; then
       git clone --branch=$CIRRUS_BRANCH https://x-access-token:${CIRRUS_REPO_CLONE_TOKEN}@github.com/${CIRRUS_REPO_FULL_NAME}.git $CIRRUS_WORKING_DIR
       git reset --hard $CIRRUS_CHANGE_IN_REPO
     else
       git clone --branch=$CIRRUS_BASE_BRANCH https://x-access-token:${CIRRUS_REPO_CLONE_TOKEN}@github.com/${CIRRUS_REPO_FULL_NAME}.git $CIRRUS_WORKING_DIR
-      git checkout -b $CIRRUS_PR
+      git symbolic-ref HEAD
+      git checkout -b PR-$CIRRUS_PR
       git fetch origin pull/$CIRRUS_PR/head
-      get merge origin/pull/$CIRRUS_PR/head
+      git symbolic-ref HEAD
+      git config user.email "sonarsource@cirrus-ci-task-${CIRRUS_TASK_ID}.org"
+      git config user.name "sonarsource@cirrus-ci-task-${CIRRUS_TASK_ID}.org"
+      git merge FETCH_HEAD
+      ls -la
     fi
+  <<: *MAVEN_CACHE
+  <<: *RUNTIME_CACHE
+  <<: *NPMRC_SCRIPT_DEFINITION
   build_and_deploy_script:
     - source cirrus-env BUILD
     - node --version

diff --git a/.../sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/JavaScriptPlugin.java b/.../sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/JavaScriptPlugin.java
@@ -257,7 +257,7 @@ public void define(Context context) {
         .builder(SKIP_NODE_PROVISIONING_PROPERTY)
         .defaultValue("false")
         .name("Skip the deployment of the embedded Node.js runtime")
-        .description(this.getHTMLMarkup("Controls whether the scanner should skip the deployment of the embedded Node.js runtime, and use the host-provided runtime instead.\n\nAnalysis will fail if a compatible version of Node.js is not provided via `sonar.nodejs.executable` or the `PATH`."))
+        .description(JavaScriptPlugin.getHTMLMarkup("Controls whether the scanner should skip the deployment of the embedded Node.js runtime, and use the host-provided runtime instead.\n\nAnalysis will fail if a compatible version of Node.js is not provided via `sonar.nodejs.executable` or the `PATH`."))
         .onQualifiers(Qualifiers.PROJECT)
         .subCategory(GENERAL)
         .category(JS_TS_CATEGORY)