Skip to content

SONARAZDO-469 Fix the coverage measurement #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antoine-vinot-sonarsource merged 2 commits into from
Apr 9, 2025
Merged

SONARAZDO-469 Fix the coverage measurement #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f55730d
Fix coverage reports
henryju Apr 9, 2025
bf267d0
Use Cirrus env variables and don't run pipeline on tags
henryju Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:
# RE-USABLE CONFIGS
#
only_sonarsource_qa: &ONLY_SONARSOURCE_QA
only_if: $CIRRUS_USER_COLLABORATOR == 'true' && ($CIRRUS_PR != "" || $CIRRUS_BRANCH == "master" || $CIRRUS_BRANCH =~ "branch-.*" || $CIRRUS_BRANCH =~ "dogfood-on-.*")
only_if: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_TAG == "" && ($CIRRUS_PR != "" || $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH || $CIRRUS_BRANCH =~ "branch-.*" || $CIRRUS_BRANCH =~ "dogfood-on-.*")

docker_build_container_template: &CONTAINER_TEMPLATE
dockerfile: .cirrus/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ gulp.task("default", gulp.series("clean", "build", "extension"));
gulp.task("sonarqube:scan", async () => {
function run(extension) {
return new Promise((resolve) => {
if (process.env.CIRRUS_BRANCH === "master" && !process.env.CIRRUS_PR) {
if (process.env.CIRRUS_BRANCH === process.env.CIRRUS_DEFAULT_BRANCH && !process.env.CIRRUS_PR) {
runSonarQubeScanner(
extension,
{
Expand Down
7 changes: 6 additions & 1 deletion src/common/sonarcloud-v1/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
const path = require("path");

module.exports = {
clearMocks: true,
collectCoverageFrom: ["**/*.ts", "!<rootDir>/node_modules/"],
coverageDirectory: "coverage",
coverageReporters: ["lcovonly", "text"],
coverageReporters: [
["lcovonly", { projectRoot: path.join(__dirname, "..", "..", "..") }],
"text",
],
moduleFileExtensions: ["ts", "js"],
testPathIgnorePatterns: ["<rootDir>/node_modules", "<rootDir>/config", "<rootDir>/build"],
testRegex: "(/__tests__/.*|\\-test)\\.ts$",
Expand Down
7 changes: 6 additions & 1 deletion src/common/sonarqube-v5/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
const path = require("path");

module.exports = {
clearMocks: true,
collectCoverageFrom: ["**/*.ts", "!<rootDir>/node_modules/"],
coverageDirectory: "coverage",
coverageReporters: ["lcovonly", "text"],
coverageReporters: [
["lcovonly", { projectRoot: path.join(__dirname, "..", "..", "..") }],
"text",
],
moduleFileExtensions: ["ts", "js"],
testPathIgnorePatterns: ["<rootDir>/node_modules", "<rootDir>/config", "<rootDir>/build"],
testRegex: "(/__tests__/.*|\\-test)\\.ts$",
Expand Down