screwdriver-coverage-sonar 3.3.1 → 3.3.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/commands.txt +2 -2
- package/index.js +1 -1
- package/package.json +6 -10
package/commands.txt
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
if [ ! -f sonar-project.properties ] && [ -z "$SD_SONAR_OPTS" ]; then echo "ERROR - No sonar project properties defined." && exit 0; fi
|
|
2
|
-
if [ ! -z "$SD_PULL_REQUEST" ] && [ "$SD_SONAR_ENTERPRISE" = true ]; then export SD_SONAR_OPTS="${SD_SONAR_OPTS} -Dsonar.pullrequest.key=$SD_PULL_REQUEST -Dsonar.pullrequest.branch
|
|
2
|
+
if [ ! -z "$SD_PULL_REQUEST" ] && [ "$SD_SONAR_ENTERPRISE" = true ]; then export SD_SONAR_OPTS="${SD_SONAR_OPTS} -Dsonar.pullrequest.key=$SD_PULL_REQUEST -Dsonar.pullrequest.branch='${PR_BRANCH_NAME#*/}' -Dsonar.pullrequest.base='${PR_BASE_BRANCH_NAME}'"; fi
|
|
3
3
|
if curl --version > /dev/null 2>&1; then SD_CURL_CMD_WRAPPER="eval"; else SD_CURL_CMD_WRAPPER="sd-step exec --pkg-version 7.54.1 core/curl"; fi
|
|
4
4
|
export SD_CURL_CMD_WRAPPER
|
|
5
5
|
SONAR_TOKEN=`$SD_CURL_CMD_WRAPPER "curl -H \"Authorization: Bearer $SD_TOKEN\" $SD_SONAR_AUTH_URL"`
|
|
@@ -15,7 +15,7 @@ SCANNER_PATH="/opt/sd/sonarscanner-cli-${TARGET_OS}/bin/sonar-scanner"
|
|
|
15
15
|
if [ -s ${SCANNER_PATH} ] && [ -x ${SCANNER_PATH} ]; then eval $SCANNER_PATH $SCANNER_OPTION || true; exit 0; fi
|
|
16
16
|
if unzip -version > /dev/null 2>&1; then SD_UNZIP_CMD_WRAPPER="eval"; else SD_UNZIP_CMD_WRAPPER="sd-step exec --pkg-version 6.0 core/unzip"; fi
|
|
17
17
|
export SD_UNZIP_CMD_WRAPPER
|
|
18
|
-
SD_SONAR_SCANNER_CLI_VERSION=4.
|
|
18
|
+
SD_SONAR_SCANNER_CLI_VERSION=4.6.2.2472
|
|
19
19
|
$SD_CURL_CMD_WRAPPER "curl -o ./sonarscanner.zip -L https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SD_SONAR_SCANNER_CLI_VERSION}-${TARGET_OS}.zip"
|
|
20
20
|
$SD_UNZIP_CMD_WRAPPER "unzip -q ./sonarscanner.zip"
|
|
21
21
|
SCANNER_PATH="sonar-scanner-${SD_SONAR_SCANNER_CLI_VERSION}-${TARGET_OS}/bin/sonar-scanner"
|
package/index.js
CHANGED
|
@@ -85,7 +85,7 @@ function configureGitApp(projectKey, projectName) {
|
|
|
85
85
|
return Promise.resolve();
|
|
86
86
|
}
|
|
87
87
|
|
|
88
|
-
const parameters = `almSetting=${gitAppEncoded}&project=${componentId}&repository=${projectName}&summaryCommentEnabled=true`;
|
|
88
|
+
const parameters = `almSetting=${gitAppEncoded}&project=${componentId}&repository=${projectName}&summaryCommentEnabled=true&monorepo=false`;
|
|
89
89
|
|
|
90
90
|
return request({
|
|
91
91
|
method: 'POST',
|
package/package.json
CHANGED
|
@@ -1,16 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "screwdriver-coverage-sonar",
|
|
3
|
-
"version": "3.3.
|
|
3
|
+
"version": "3.3.4",
|
|
4
4
|
"description": "SonarQube implementation of the coverage-base class",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"pretest": "eslint .",
|
|
8
|
-
"test": "nyc --report-dir ./artifacts/coverage --reporter=lcov mocha --reporter mocha-multi-reporters --reporter-options configFile=./mocha.config.json --recursive --timeout 4000 --retries 1 --exit --allow-uncaught true --color true"
|
|
9
|
-
"semantic-release": "semantic-release pre && npm publish && semantic-release post"
|
|
8
|
+
"test": "nyc --report-dir ./artifacts/coverage --reporter=lcov mocha --reporter mocha-multi-reporters --reporter-options configFile=./mocha.config.json --recursive --timeout 4000 --retries 1 --exit --allow-uncaught true --color true"
|
|
10
9
|
},
|
|
11
10
|
"repository": {
|
|
12
11
|
"type": "git",
|
|
13
|
-
"url": "git
|
|
12
|
+
"url": "git+https://github.com/screwdriver-cd/coverage-sonar.git"
|
|
14
13
|
},
|
|
15
14
|
"homepage": "https://github.com/screwdriver-cd/coverage-sonar",
|
|
16
15
|
"bugs": "https://github.com/screwdriver-cd/screwdriver/issues",
|
|
@@ -33,7 +32,7 @@
|
|
|
33
32
|
"chai": "^4.2.0",
|
|
34
33
|
"eslint": "^7.31.0",
|
|
35
34
|
"eslint-config-screwdriver": "^5.0.1",
|
|
36
|
-
"mocha": "^
|
|
35
|
+
"mocha": "^9.1.3",
|
|
37
36
|
"mocha-multi-reporters": "^1.5.1",
|
|
38
37
|
"mocha-sonarqube-reporter": "^1.0.2",
|
|
39
38
|
"mockery": "^2.1.0",
|
|
@@ -49,9 +48,6 @@
|
|
|
49
48
|
"uuid": "^3.4.0"
|
|
50
49
|
},
|
|
51
50
|
"release": {
|
|
52
|
-
"debug": false
|
|
53
|
-
"verifyConditions": {
|
|
54
|
-
"path": "./node_modules/semantic-release/src/lib/plugin-noop.js"
|
|
55
|
-
}
|
|
51
|
+
"debug": false
|
|
56
52
|
}
|
|
57
|
-
}
|
|
53
|
+
}
|