diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml index 5bccba8387..fea009dbd8 100644 --- a/.github/workflows/test-pr.yml +++ b/.github/workflows/test-pr.yml @@ -12,7 +12,7 @@ jobs: defaults: run: working-directory: ./prime-angular-frontend - + if: github.ref != 'develop' || (github.ref == 'develop' && github.event.pull_request.merged == true) runs-on: ubuntu-latest @@ -59,15 +59,15 @@ jobs: - name: Collect Frontend Report run: | cc-test-reporter format-coverage -t lcov -o coverage/frontend.json coverage/lcov.info - + - name: Create frontend coverage file artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: frontend path: ./prime-angular-frontend/coverage/frontend.json retention-days: 1 - + collect-backend-coverage: defaults: run: @@ -101,7 +101,7 @@ jobs: run: | cd ../ dotnet tool install -g dotnet-reportgenerator-globaltool --version 5.3.6 - + - uses: amancevice/setup-code-climate@v0 with: cc_test_reporter_id: ${{ secrets.CC_TEST_REPORTER_ID }} @@ -122,12 +122,12 @@ jobs: cd ../prime-dotnet-webapi cc-test-reporter format-coverage -t lcov -o ../prime-dotnet-webapi-tests/coverage/backend.json ../prime-dotnet-webapi-tests/coverage/lcov.info -p /home/runner/work/moh-prime/moh-prime/prime-dotnet-webapi - name: Create backend coverage file artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: backend path: ./prime-dotnet-webapi-tests/coverage/backend.json retention-days: 1 - + codeclimate-sum-coverage: needs: [ collect-frontend-coverage, collect-backend-coverage ] @@ -146,25 +146,25 @@ jobs: cc_test_reporter_version: latest # optional - name: Download frontend artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: frontend # path: frontend/ - name: Download backend artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: backend # path: backend/ - name: Sum files - run: | + run: | cc-test-reporter sum-coverage -p 2 frontend.json backend.json cc-test-reporter upload-coverage -i ./coverage/codeclimate.json - + - name: Create summed report - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: summed path: ./coverage/codeclimate.json - retention-days: 1 \ No newline at end of file + retention-days: 1