From a3d7b809888bcf4d7df562e81c9ad33a4eeb311b Mon Sep 17 00:00:00 2001 From: fisker Date: Sun, 26 Jan 2020 02:43:46 +0800 Subject: [PATCH] reduce matrix --- .azure-pipelines/jobs/dev-test.yml | 1 + .azure-pipelines/jobs/prod-test.yml | 1 + .../steps/publish-code-coverage.yml | 11 ++++++++ .github/workflows/dev-test.yml | 11 +++++++- .github/workflows/prod-test.yml | 27 ++++++++++++++++++- README.md | 8 ++++-- 6 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 .azure-pipelines/steps/publish-code-coverage.yml diff --git a/.azure-pipelines/jobs/dev-test.yml b/.azure-pipelines/jobs/dev-test.yml index 396a9af849e1..a34f334f3b20 100644 --- a/.azure-pipelines/jobs/dev-test.yml +++ b/.azure-pipelines/jobs/dev-test.yml @@ -4,3 +4,4 @@ steps: - script: yarn test displayName: "Run tests" - template: ../steps/publish-test-results.yml + - template: ../steps/publish-code-coverage.yml diff --git a/.azure-pipelines/jobs/prod-test.yml b/.azure-pipelines/jobs/prod-test.yml index ca4405f39431..29acd85677a9 100644 --- a/.azure-pipelines/jobs/prod-test.yml +++ b/.azure-pipelines/jobs/prod-test.yml @@ -5,3 +5,4 @@ steps: - script: yarn test:dist displayName: "Run tests on dist" - template: ../steps/publish-test-results.yml + - template: ../steps/publish-code-coverage.yml diff --git a/.azure-pipelines/steps/publish-code-coverage.yml b/.azure-pipelines/steps/publish-code-coverage.yml new file mode 100644 index 000000000000..9c5cd329a279 --- /dev/null +++ b/.azure-pipelines/steps/publish-code-coverage.yml @@ -0,0 +1,11 @@ +steps: + - task: PublishCodeCoverageResults@1 + inputs: + codeCoverageTool: Cobertura + reportDirectory: $(System.DefaultWorkingDirectory)/coverage + summaryFileLocation: $(System.DefaultWorkingDirectory)/coverage/cobertura-coverage.xml + displayName: "Publish coverage" + condition: and(variables.ENABLE_CODE_COVERAGE, succeededOrFailed()) + - script: yarn codecov -f coverage/cobertura-coverage.xml + displayName: "Publish coverage to Codecov" + condition: and(variables.ENABLE_CODE_COVERAGE, succeededOrFailed()) diff --git a/.github/workflows/dev-test.yml b/.github/workflows/dev-test.yml index b80659437543..b91b32dfc554 100644 --- a/.github/workflows/dev-test.yml +++ b/.github/workflows/dev-test.yml @@ -1,4 +1,4 @@ -name: Dev_Test +name: Dev on: [push, pull_request] @@ -15,6 +15,15 @@ jobs: - "13" - "12" - "10" + exclude: + - os: "macos-latest" + node: "13" + - os: "macos-latest" + node: "12" + - os: "windows-latest" + node: "13" + - os: "windows-latest" + node: "12" include: # only enable coverage on the fastest job - os: "ubuntu-latest" diff --git a/.github/workflows/prod-test.yml b/.github/workflows/prod-test.yml index 0778641cf35a..bfa0d53cfdfc 100644 --- a/.github/workflows/prod-test.yml +++ b/.github/workflows/prod-test.yml @@ -1,4 +1,4 @@ -name: Prod_Test +name: Prod on: [push, pull_request] @@ -71,6 +71,31 @@ jobs: standalone: - "standalone" - "" + exclude: + - os: "macos-latest" + node: "13" + standalone: "standalone" + - os: "macos-latest" + node: "12" + standalone: "standalone" + - os: "windows-latest" + node: "13" + standalone: "standalone" + - os: "windows-latest" + node: "12" + standalone: "standalone" + - os: "macos-latest" + node: "13" + standalone: "" + - os: "macos-latest" + node: "12" + standalone: "" + - os: "windows-latest" + node: "13" + standalone: "" + - os: "windows-latest" + node: "12" + standalone: "" env: STANDALONE: ${{ matrix.standalone }} name: Node.js ${{ matrix.node }} on ${{ matrix.os }} ${{ matrix.standalone }} diff --git a/README.md b/README.md index a6a129de2373..7ca83481a6ca 100644 --- a/README.md +++ b/README.md @@ -45,8 +45,12 @@ This is the branch containing code for Prettier’s 2.0 release. See [the `maste

Azure Pipelines Build Status - - Github Actions Build Status + + Github Actions Build Status + + Github Actions Build Status + + Github Actions Build Status Codecov Coverage Status