diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 0b6a98af0..000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,44 +0,0 @@ -version: 2.1 - -orbs: - maven: circleci/maven@1.2.0 -executors: - docker-build: - docker: - - image: circleci/openjdk:11-jdk - - image: circleci/postgres:latest - command: - - "--max_prepared_transactions=110" - #auth: - # username: user - # password: password - environment: - POSTGRES_USER: user - POSTGRES_PASSWORD: password - POSTGRES_DB: cargotracker -jobs: - build: - executor: docker-build - steps: - - checkout - - maven/with_cache: - steps: - - run: - name: Analyze on SonarCloud - command: | - mvn clean verify -Parq-payara-managed,coverage jacoco:report \ - org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \ - -Dsonar.host.url=https://sonarcloud.io \ - -Dsonar.login=$SONAR_TOKEN \ - -Dsonar.organization=hantsy \ - -Dsonar.projectKey=hantsy_cargotracker \ - -Dsonar.coverage.exclusions=**/dto/*,**/*Configuration.*,**/SampleDataGenerator.* - - maven/process_test_results -workflows: - main: - jobs: - - build -# context: SonarCloud -# filters: -# branches: -# only: master diff --git a/.github/workflows/arq-glassfish-managed.yml b/.github/workflows/arq-glassfish-managed.yml index e27903fc4..72bf6626f 100644 --- a/.github/workflows/arq-glassfish-managed.yml +++ b/.github/workflows/arq-glassfish-managed.yml @@ -33,6 +33,13 @@ jobs: docker ps -a - name: Build with Maven run: | - mvn -B -q clean verify -Parq-glassfish-managed + mvn -B -q clean package + mvn -B -q verify -Parq-glassfish-managed,coverage jacoco:report \ + org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \ + -Dsonar.host.url=https://sonarcloud.io \ + -Dsonar.login=$SONAR_TOKEN \ + -Dsonar.organization=hantsy \ + -Dsonar.projectKey=hantsy_cargotracker \ + -Dsonar.coverage.exclusions=**/dto/*,**/*Configuration.*,**/SampleDataGenerator.* diff --git a/README.md b/README.md index 9cbd71b82..cbcc1646b 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,6 @@ ![Integration Test with Arquillian WildFly Managed Container](https://github.com/hantsy/cargotracker/workflows/arq-wildfly-managed/badge.svg) ![Integration Test with Arquillian WildFly Remote Container](https://github.com/hantsy/cargotracker/workflows/arq-wildfly-remote/badge.svg) - -[![CircleCI](https://circleci.com/gh/hantsy/cargotracker.svg?style=svg)](https://circleci.com/gh/hantsy/cargotracker) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=hantsy_cargotracker&metric=alert_status)](https://sonarcloud.io/dashboard?id=hantsy_cargotracker) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=hantsy_cargotracker&metric=coverage)](https://sonarcloud.io/dashboard?id=hantsy_cargotracker)