Skip to content

Commit

Permalink
Fix CI Build
Browse files Browse the repository at this point in the history
  • Loading branch information
radcortez committed Oct 16, 2024
1 parent 2361bd5 commit cecca8f
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 28 deletions.
15 changes: 13 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
push:
branches:
- main
- jakarta
paths-ignore:
- '.gitignore'
- 'CODEOWNERS'
Expand Down Expand Up @@ -80,12 +79,24 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 11
cache: 'maven'
cache-dependency-path: '**/pom.xml'

- name: build with docs and coverage
run: mvn verify -Pcoverage javadoc:javadoc

- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17

- name: sonar
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
SONAR_TOKEN: ${{secrets.SONAR_TOKEN}}
run: mvn -B verify --file pom.xml -Pcoverage javadoc:javadoc sonar:sonar -Dsonar.projectKey=smallrye_smallrye-jwt -Dsonar.token=$SONAR_TOKEN
run: mvn sonar:sonar -Psonar -Dsonar.token=${{secrets.SONAR_TOKEN}}
12 changes: 12 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -212,5 +212,17 @@
<module>release</module>
</modules>
</profile>
<profile>
<id>sonar</id>
<properties>
<sonar.projectName>SmallRye JWT</sonar.projectName>
<sonar.projectKey>io.smallrye:smallrye-jwt</sonar.projectKey>
<sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
<!--suppress UnresolvedMavenProperty -->
<sonar.coverage.jacoco.xmlReportPaths>
${maven.multiModuleProjectDirectory}/coverage/target/site/jacoco-aggregate/jacoco.xml
</sonar.coverage.jacoco.xmlReportPaths>
</properties>
</profile>
</profiles>
</project>
3 changes: 2 additions & 1 deletion testsuite/tck/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,10 @@
<artifactId>microprofile-jwt-auth-tck</artifactId>
<version>${version.eclipse.microprofile.jwt}</version>
<type>test-jar</type>
<classifier>tests</classifier>
<overWrite>false</overWrite>
<includes>**/*.xml</includes>
<outputDirectory>${project.build.directory}/tck-suite</outputDirectory>
<includes>**/tck-base-suite.xml</includes>
</artifactItem>
</artifactItems>
</configuration>
Expand Down
25 changes: 0 additions & 25 deletions to-jakarta.sh

This file was deleted.

0 comments on commit cecca8f

Please sign in to comment.