Skip to content

Commit

Permalink
chore: updating merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
paulushcgcj committed Nov 29, 2023
1 parent e508959 commit 9f25957
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions .github/workflows/merge-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
if: github.event_name != 'pull_request' || !github.event.pull_request.draft
runs-on: ubuntu-22.04
steps:
- uses: bcgov-nr/action-test-and-analyse-java@v0.2.0
- uses: bcgov-nr/action-test-and-analyse-java@v1.0.0
name: Backend Coverage
with:
commands: |
Expand All @@ -34,8 +34,9 @@ jobs:
-Dsonar.coverage.jacoco.xmlReportPaths=target/coverage-reports/merged-test-report/jacoco.xml
-Dsonar.java.checkstyle.reportPaths=target/checkstyle-result.xml
-Dsonar.coverage.exclusions=**/configuration/**,**/exception/**,**/dto/**,**/entity/**,**/models/**,**/repository/**,**/*$*Builder*,**/BootApplication*
sonar_project_token: ${{ secrets.SONAR_TOKEN_BACKEND }}
- uses: bcgov-nr/[email protected]
sonar_token: ${{ secrets.SONAR_TOKEN_BACKEND }}
triggers: ('backend/')
- uses: bcgov-nr/[email protected]
name: Legacy Coverage
with:
commands: |
Expand All @@ -50,8 +51,9 @@ jobs:
-Dsonar.coverage.jacoco.xmlReportPaths=target/coverage-reports/merged-test-report/jacoco.xml
-Dsonar.java.checkstyle.reportPaths=target/checkstyle-result.xml
-Dsonar.coverage.exclusions=**/configuration/**,**/exception/**,**/dto/**,**/entity/**,**/repository/**,**/*$*Builder*,**/LegacyApplication***/ApplicationConstants*
sonar_project_token: ${{ secrets.SONAR_TOKEN_LEGACY }}
- uses: bcgov-nr/[email protected]
sonar_token: ${{ secrets.SONAR_TOKEN_LEGACY }}
triggers: ('legacy/')
- uses: bcgov-nr/[email protected]
name: Processor Coverage
with:
commands: |
Expand All @@ -66,7 +68,8 @@ jobs:
-Dsonar.coverage.jacoco.xmlReportPaths=target/coverage-reports/merged-test-report/jacoco.xml
-Dsonar.java.checkstyle.reportPaths=target/checkstyle-result.xml
-Dsonar.coverage.exclusions=**/configuration/**,**/dto/**,**/entity/**,**/repository/**,**/*$*Builder*,**/ProcessApplication***/ApplicationConstant*
sonar_project_token: ${{ secrets.SONAR_TOKEN_PROCESSOR }}
sonar_token: ${{ secrets.SONAR_TOKEN_PROCESSOR }}
triggers: ('processor/')

tests-frontend:
name: Frontend Unit Tests
Expand All @@ -91,6 +94,7 @@ jobs:
-Dsonar.organization=bcgov-sonarcloud
-Dsonar.projectKey=forest-client-frontend
sonar_token: ${{ secrets.SONAR_TOKEN_FRONTEND }}
triggers: ('frontend/')

codeql:
name: Semantic Code Analysis
Expand Down

0 comments on commit 9f25957

Please sign in to comment.