Skip to content

Commit

Permalink
chore: Fix Sonar build (fabric8io#1345)
Browse files Browse the repository at this point in the history
* chore: Fix Sonar build

* Update to Java 11

* more fixe
  • Loading branch information
rhuss authored Jun 4, 2020
1 parent 3ab43f2 commit 27c690d
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
doc:
working_directory: ~/fabric8io/dmp-docs
docker:
- image: circleci/node:8-browsers
- image: circleci/node:9-browsers
steps:
- checkout
- run:
Expand All @@ -17,7 +17,7 @@ jobs:
build:
working_directory: ~/fabric8io/docker-maven-plugin
docker:
- image: circleci/openjdk:8-node-browsers
- image: circleci/openjdk:11
steps:
- checkout
- restore_cache:
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
sonar-pr:
working_directory: ~/fabric8io/dmp-sonar-pr
docker:
- image: circleci/openjdk:8-node-browsers
- image: circleci/openjdk:11
steps:
- checkout
- restore_cache:
Expand All @@ -67,6 +67,7 @@ jobs:
-Dsonar.pullrequest.github.repository=fabric8io/docker-maven-plugin \
-Dsonar.github.oauth=${GITHUB_COMMENT_TOKEN} \
-Dsonar.host.url=https://sonarcloud.io \
-Dsonar.organization=default \
-Dsonar.login=${SONARQUBE_TOKEN}
else
echo "No Sonar PR analysis as this is not a pull request"
Expand All @@ -80,14 +81,15 @@ jobs:
sonar:
working_directory: ~/fabric8io/dmp-sonar
docker:
- image: circleci/openjdk:8-node-browsers
- image: circleci/openjdk:11
steps:
- checkout
- restore_cache:
key: dmp-sonar-{{ checksum "pom.xml" }}
- run: |
mvn clean -Pjacoco org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar \
-Dsonar.host.url=https://sonarcloud.io \
-Dsonar.organization=default \
-Dsonar.login=${SONARQUBE_TOKEN}
- save_cache:
key: dmp-sonar-{{ checksum "pom.xml" }}
Expand Down

0 comments on commit 27c690d

Please sign in to comment.