Skip to content

Commit

Permalink
Updating Sonar integration config
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul McKeown committed Dec 14, 2024
1 parent 95c260d commit e5cb6b8
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 15 deletions.
39 changes: 26 additions & 13 deletions .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,37 @@
name: SonarCloud

name: SonarQube
on:
push:
branches: [ main ]
branches:
- main
pull_request:
branches: [ feature/* ]

types: [opened, synchronize, reopened]
jobs:
build:
name: Build and analyze
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'zulu' # Alternative distribution options are available.
- name: Cache SonarQube packages
uses: actions/cache@v4
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Maven packages
uses: actions/cache@v4
with:
java-version: '17'
distribution: 'temurin'
cache: maven
- name: Analyze with SonarCloud
run: mvn -B verify sonar:sonar -Dsonar.projectKey=dependency-track-maven-plugin -Dsonar.organization=pmckeown -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=pmckeown_dependency-track-maven-plugin
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.version>3.9.5</maven.version>
<sonar.organization>pmckeown</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
</properties>

<dependencies>
Expand Down Expand Up @@ -427,8 +429,6 @@
</property>
</activation>
<properties>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<sonar.organization>pmckeown</sonar.organization>
<sonar.projectKey>io.github.pmckeown:dependency-track-maven-plugin</sonar.projectKey>
<!--suppress UnresolvedMavenProperty -->
<sonar.login>${env.SONAR_TOKEN}</sonar.login>
Expand Down

0 comments on commit e5cb6b8

Please sign in to comment.