diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1eb8c3d..5d1385a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -69,6 +69,13 @@ jobs: with: name: Build path: build + + - name: Composer Up + uses: eskatos/gradle-command-action@v1 + with: + gradle-version: 6.8 + arguments: testSqlComposeUp + - name: TestSql uses: eskatos/gradle-command-action@v1 with: @@ -81,19 +88,29 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: java-version: 11 + - uses: actions/download-artifact@v2 with: name: Build path: build + + - name: Composer Up + uses: eskatos/gradle-command-action@v1 + with: + gradle-version: 6.8 + arguments: testComposeUp + - name: Test uses: eskatos/gradle-command-action@v1 with: gradle-version: 6.8 - arguments: test -x testSql + arguments: test + - name: Coverage uses: eskatos/gradle-command-action@v1 with: @@ -101,17 +118,28 @@ jobs: arguments: coveralls env: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} + - name: Cache SonarCloud packages uses: actions/cache@v1 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar + + - name: Test + uses: eskatos/gradle-command-action@v1 + with: + gradle-version: 6.8 + arguments: test + - name: Build and analyze + uses: eskatos/gradle-command-action@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: ./gradlew build sonarqube --info + with: + gradle-version: 6.8 + arguments: sonarqube --info lint: needs: build diff --git a/.idea/runConfigurations/Build_without_test.xml b/.idea/runConfigurations/Build_without_test.xml index 0898a5a..92be20b 100644 --- a/.idea/runConfigurations/Build_without_test.xml +++ b/.idea/runConfigurations/Build_without_test.xml @@ -4,7 +4,7 @@ diff --git a/.idea/runConfigurations/Sonarqube_without_test.xml b/.idea/runConfigurations/Sonarqube__Send_without_run_test_.xml similarity index 87% rename from .idea/runConfigurations/Sonarqube_without_test.xml rename to .idea/runConfigurations/Sonarqube__Send_without_run_test_.xml index 1774008..b7e8407 100644 --- a/.idea/runConfigurations/Sonarqube_without_test.xml +++ b/.idea/runConfigurations/Sonarqube__Send_without_run_test_.xml @@ -1,5 +1,5 @@ - +