diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77ba4e30c7..f82be05653 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,72 +51,16 @@ jobs: name: Run Unit Tests (Electron) - run: DISPLAY=:10 ./scripts/test-extensions-unit.sh name: Run Extension Unit Tests (Electron) - # {{SQL CARBON EDIT}} Add coveralls - - name: Upload Core Coverage - uses: coverallsapp/github-action@v1.0.1 - with: - parallel: true - github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: '.build/coverage-single/lcov.info' - - name: Upload admin-tool-ext-win Extension Coverage - uses: coverallsapp/github-action@v1.0.1 - with: - parallel: true - github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: './extensions/admin-tool-ext-win/coverage/lcov.info' - - name: Upload agent Extension Coverage - uses: coverallsapp/github-action@v1.0.1 - with: - parallel: true - github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: './extensions/agent/coverage/lcov.info' - - name: Upload azurecore Extension Coverage - uses: coverallsapp/github-action@v1.0.1 - with: - parallel: true - github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: './extensions/azurecore/coverage/lcov.info' - - name: Upload cms Extension Coverage - uses: coverallsapp/github-action@v1.0.1 - with: - parallel: true - github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: './extensions/cms/coverage/lcov.info' - - name: Upload dacpac Extension Coverage - uses: coverallsapp/github-action@v1.0.1 - with: - parallel: true - github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: './extensions/dacpac/coverage/lcov.info' - - name: Upload schema-compare Extension Coverage - uses: coverallsapp/github-action@v1.0.1 - with: - parallel: true - github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: './extensions/schema-compare/coverage/lcov.info' - - name: Upload notebook Extension Coverage - uses: coverallsapp/github-action@v1.0.1 - with: - parallel: true - github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: './extensions/notebook/coverage/lcov.info' - - name: Upload resource-deployment Extension Coverage - uses: coverallsapp/github-action@v1.0.1 - with: - parallel: true - github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: './extensions/resource-deployment/coverage/lcov.info' - - name: Upload machine-learning-services Extension Coverage - uses: coverallsapp/github-action@v1.0.1 - with: - parallel: true - github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: './extensions/machine-learning-services/coverage/lcov.info' - - name: Finish Parallel Coveralls Uploads + # {{SQL CARBON EDIT}} Add coveralls. We merge first to get around issue where parallel builds weren't being combined correctly + - run: | + mkdir .build/coverage-combined + cat .build/coverage-single/lcov.info ./extensions/admin-tool-ext-win/coverage/lcov.info ./extensions/agent/coverage/lcov.info ./extensions/azurecore/coverage/lcov.info ./extensions/cms/coverage/lcov.info ./extensions/dacpac/coverage/lcov.info ./extensions/schema-compare/coverage/lcov.info ./extensions/notebook/coverage/lcov.info ./extensions/resource-deployment/coverage/lcov.info ./extensions/machine-learning-services/coverage/lcov.info > .build/coverage-combined/lcov.info + name: Merge coverage reports + - name: Upload Code Coverage uses: coverallsapp/github-action@v1.0.1 with: github-token: ${{ secrets.GITHUB_TOKEN }} - parallel-finished: true + path-to-lcov: '.build/coverage-combined/lcov.info' # Fails with cryptic error (e.g. https://github.com/microsoft/vscode/pull/90292/checks?check_run_id=433681926#step:13:9) # - run: DISPLAY=:10 yarn test-browser --browser chromium