diff --git a/.ci/validation.sh b/.ci/validation.sh index e519c4de2..61a5238e0 100755 --- a/.ci/validation.sh +++ b/.ci/validation.sh @@ -48,9 +48,10 @@ sevntu-checks) cd sevntu-checks mvn -e --no-transfer-progress -Pcoverall install mvn -e --no-transfer-progress verify -Pno-validations,selftesting - if [[ $TRAVIS == 'true' ]]; then - mvn -e --no-transfer-progress -Pcoverall jacoco:report coveralls:report - fi + # until https://github.com/sevntu-checkstyle/sevntu.checkstyle/issues/999 + # if [[ $CI == 'true' ]]; then + # mvn -e --no-transfer-progress -Pcoverall jacoco:report coveralls:report + # fi ;; all-sevntu-checks-contribution) @@ -117,7 +118,10 @@ sonarqube) # SONAR_TOKEN=xxxxxx ./.ci/validation.sh sonarqube # execution on local for non-master: # SONAR_TOKEN=xxxxxx PR_NUMBER=xxxxxx PR_BRANCH_NAME=xxxxxx ./.ci/validation.sh sonarqube - checkForVariable "SONAR_TOKEN" + if [ -z "$SONAR_TOKEN" ]; then + echo "SONAR_TOKEN is not set." + exit 1 + fi if [[ $PR_NUMBER =~ ^([0-9]+)$ ]]; then SONAR_PR_VARIABLES="-Dsonar.pullrequest.key=$PR_NUMBER" @@ -126,20 +130,22 @@ sonarqube) echo "SONAR_PR_VARIABLES: ""$SONAR_PR_VARIABLES" fi + cd sevntu-checks export MAVEN_OPTS='-Xmx2000m' # until https://github.com/checkstyle/checkstyle/issues/11637 # shellcheck disable=SC2086 - mvn -e --no-transfer-progress -Pno-validations clean package sonar:sonar \ + mvn -e --no-transfer-progress clean package sonar:sonar \ $SONAR_PR_VARIABLES \ -Dsonar.host.url=https://sonarcloud.io \ -Dsonar.login="$SONAR_TOKEN" \ - -Dsonar.projectKey=org.checkstyle:sevntu \ - -Dsonar.organization=checkstyle + -Dsonar.organization=checkstyle \ + -Dmaven.test.failure.ignore=true \ + -Dcheckstyle.ant.skip=true -Dpmd.skip=true echo "report-task.txt:" cat target/sonar/report-task.txt echo "Verification of sonar gate status" export SONAR_API_TOKEN=$SONAR_TOKEN - .ci/sonar-break-build.sh + ../.ci/sonar-break-build.sh ;; git-diff) diff --git a/.circleci/config.yml b/.circleci/config.yml index 406d0ca2c..d5b76fb05 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,15 +20,13 @@ jobs: - restore_cache: name: Restore Maven repo cache keys: - - mvn-cache-{{ checksum "pom.xml" }} + - mvn-cache-{{ checksum "sevntu-checks/pom.xml" }} - run: command: << parameters.command >> - - run: - command: | - ./.ci/validation.sh git-diff + - run: ./.ci/validation.sh git-diff - save_cache: name: Save Maven repo cache - key: mvn-cache-{{ checksum "pom.xml" }} + key: mvn-cache-{{ checksum "sevntu-checks/pom.xml" }} paths: - .m2 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 227d1466f..000000000 --- a/.travis.yml +++ /dev/null @@ -1,94 +0,0 @@ -version: ~> 1.0 -dist: focal -# this arch is required as is for Partner Queue Solution - DO NOT MODIFY -arch: ppc64le -language: java - -cache: - directories: - - ~/.m2 - -addons: - apt: - packages: - - xmlstarlet - - maven - -branches: - only: - - master - -install: true - - -jobs: - fast_finish: true - include: - # eclipse-cs - - jdk: openjdk11 - env: - - DESC="eclipse-cs" - - USE_MAVEN_REPO="true" - - CMD="./.ci/validation.sh eclipse-cs" - - # idea-extension - - jdk: openjdk11 - env: - - DESC="idea-extension" - - USE_MAVEN_REPO="true" - - CMD="./.ci/validation.sh idea-extension" - - # sonar-plugin - - jdk: openjdk11 - env: - - DESC="sonar-plugin" - - USE_MAVEN_REPO="true" - - CMD="./.ci/validation.sh sonar-plugin" - - # checks - - jdk: openjdk11 - env: - - DESC="checks" - - USE_MAVEN_REPO="true" - - CMD="./.ci/validation.sh sevntu-checks" - - # Ensure that all sevntu checks are used in contribution - - jdk: openjdk11 - env: - - DESC="All sevntu checks should be used in contribution" - - CMD="./.ci/validation.sh all-sevntu-checks-contribution" - - # regression on checkstyle - - jdk: openjdk11 - env: - - DESC="checkstyle-regression" - - USE_MAVEN_REPO="true" - - CMD="./.ci/validation.sh checkstyle-regression" - - # eclipse static analysis - - jdk: openjdk11 - env: - - DESC="eclipse-analysis" - - USE_MAVEN_REPO="true" - - CMD="./.ci/validation.sh eclipse-analysis" - - # https://sonarcloud.io (openjdk11) - - jdk: openjdk11 - env: - - DESC="sonarcloud.io" - - USE_MAVEN_REPO="true" - - CMD="./.ci/validation.sh sonarqube" - -script: - # required to run javadoc in travis - # this must be in yml to pass to other scripts - - export JAVA_HOME="/usr/lib/jvm/"$(ls /usr/lib/jvm/ | head -n 1)"/" - - echo "JAVA_HOME="$JAVA_HOME - - export PATH=$JAVA_HOME:$PATH - - echo "PATH="$PATH - - ./.ci/travis.sh init-m2-repo - - ./.ci/travis.sh run-command "$CMD" - - ./.ci/validation.sh git-diff - - sleep 5s - -after_success: diff --git a/README.textile b/README.textile index 52a9fa963..c0e5a098b 100644 --- a/README.textile +++ b/README.textile @@ -1,4 +1,4 @@ -h3. Information "!https://secure.travis-ci.org/sevntu-checkstyle/sevntu.checkstyle.png!":https://app.travis-ci.com/github/sevntu-checkstyle/sevntu.checkstyle/builds !https://coveralls.io/repos/sevntu-checkstyle/sevntu.checkstyle/badge.svg?branch=master&service=github(Coverage Status)!:https://coveralls.io/github/sevntu-checkstyle/sevntu.checkstyle?branch=master !https://sonarcloud.io/api/project_badges/measure?project=com.github.sevntu-checkstyle%3Asevntu-checks&metric=sqale_index!:https://sonarcloud.io/dashboard?id=com.github.sevntu-checkstyle%3Asevntu-checks +h3. Information !https://circleci.com/gh/sevntu-checkstyle/sevntu.checkstyle/tree/master!:https://circleci.com/gh/sevntu-checkstyle/sevntu.checkstyle/tree/master.svg?style=svg !https://coveralls.io/repos/sevntu-checkstyle/sevntu.checkstyle/badge.svg?branch=master&service=github(Coverage Status)!:https://coveralls.io/github/sevntu-checkstyle/sevntu.checkstyle?branch=master !https://sonarcloud.io/api/project_badges/measure?project=com.github.sevntu-checkstyle%3Asevntu-checks&metric=sqale_index!:https://sonarcloud.io/dashboard?id=com.github.sevntu-checkstyle%3Asevntu-checks sevntu-checks: !https://img.shields.io/maven-central/v/com.github.sevntu-checkstyle/sevntu-checks.svg?label=Maven%20Central!:https://search.maven.org/search?q=g:%22com.github.sevntu-checkstyle%22%20AND%20a:%22sevntu-checks%22 sevntu-checkstyle-idea-extension:!https://img.shields.io/maven-central/v/com.github.sevntu-checkstyle/sevntu-checkstyle-idea-extension.svg?label=Maven%20Central!:https://search.maven.org/search?q=g:%22com.github.sevntu-checkstyle%22%20AND%20a:%22sevntu-checkstyle-idea-extension%22 diff --git a/sevntu-checks/config/checkstyle-non-main-files-suppressions.xml b/sevntu-checks/config/checkstyle-non-main-files-suppressions.xml index de647f8e8..f0bcbef33 100644 --- a/sevntu-checks/config/checkstyle-non-main-files-suppressions.xml +++ b/sevntu-checks/config/checkstyle-non-main-files-suppressions.xml @@ -25,6 +25,7 @@ +