diff --git a/.gitignore b/.gitignore index 58cad79dcf31fddb9a7db9351d527bbce1fffe66..6e580b7cf205c901e257a01cc8c9ad065c0a294b 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,6 @@ testem.log .DS_Store Thumbs.db -# sonar and gradle stuff -build -.gradle +# code analysis +.lcov_output +.scannerwork diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49085d5150e12c22b8efc196d3869b001c3374fb..c971fe4e6a6ba2b9efd2771b2750f9d6f1a2b391 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,16 +24,15 @@ tslint: sonar: stage: codestyle - only: - - master + # only: + # - master tags: - - gradle-node + - sonar-cli allow_failure: true dependencies: [] - variables: - GIT_DEPTH: 0 script: - - gradle sonarqube -Dsonar.host.url=https://scm.thm.de/sonar/ + - npm i + - sonar-scanner -Dsonar.host.url=https://scm.thm.de/sonar/ #unit_tests: # stage: test diff --git a/build.gradle b/build.gradle deleted file mode 100644 index b2e5cb280de70755ac2cd8bf71f0bbb3ea0243b3..0000000000000000000000000000000000000000 --- a/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -/* This Gradle build script is currently only used for SonarQube Scanner */ - -plugins { - id "org.sonarqube" version "2.5" -} - -group = "de.thm.arsnova" - -sonarqube { - properties { - - property "sonar.projectKey", "de.thm.arsnova:frag-jetzt-frontend" - property "sonar.projectName", "frag.jetzt Frontend" - property "sonar.projectVersion", "1.0" - - property "sonar.language", "ts" - property "sonar.sourceEncoding", "UTF-8" - - property "sonar.sources", "src" - property "sonar.exclusions", "**/node_modules/**, client/thirdParty/**" - - property "sonar.tests", "src" - property "sonar.test.inclusions", "**/*.spec.ts" - /* property "sonar.typescript.lcov.reportPaths", "coverage/lcov.info" */ - - property "sonar.host.url", "https://scm.thm.de/sonar/" - } -} diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index 899c9f99f396152540a60d04f0b607bf1b746d9f..0000000000000000000000000000000000000000 --- a/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -org.gradle.jvmargs=-Xmx2048m diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 0000000000000000000000000000000000000000..0c1a534dda04a810acaf89d1857b1c0fd86552f1 --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,12 @@ +# Required metadata +sonar.projectKey=de.thm.arsnova:frag-jetzt-frontend +sonar.projectName=frag.jetzt Frontend +sonar.projectVersion=1.0 +sonar.language=ts +sonar.sources=./src +sonar.exclusions=dist/**/*, node_modules/**/*, **/*.spec.ts +sonar.sourceEncoding=UTF-8 +sonar.tests=./src +sonar.test.inclusions=**/*.spec.ts +sonar.host.url=http://sonarqube:9000 +# sonar.typescript.lcov.reportPaths=.lcov_output/lcov.info