From c22fbec6a90a331047f8adcfeccb13fc4c4016ff Mon Sep 17 00:00:00 2001 From: Irtaza Akram Date: Wed, 29 May 2024 21:15:00 +0500 Subject: [PATCH] fix: move collect-and-verify to unit-tests.yml --- .github/workflows/unit-tests.yml | 20 +++++++++++++ .../workflows/verify-gha-unit-tests-count.yml | 28 ------------------- 2 files changed, 20 insertions(+), 28 deletions(-) delete mode 100644 .github/workflows/verify-gha-unit-tests-count.yml diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index f51945d308..694e911fe9 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -107,6 +107,26 @@ jobs: path: reports/${{matrix.shard_name}}.coverage overwrite: true + collect-and-verify: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v4 + - name: Setup Python + uses: actions/setup-python@v5 + with: + python-version: 3.11 + + - name: install system requirements + run: | + make ubuntu-requirements + + - name: install requirements + run: | + make test-requirements + + - name: verify unit tests count + uses: ./.github/actions/verify-tests-count + # This job aggregates test results. It's the required check for branch protection. # https://github.com/marketplace/actions/alls-green#why # https://github.com/orgs/community/discussions/33579 diff --git a/.github/workflows/verify-gha-unit-tests-count.yml b/.github/workflows/verify-gha-unit-tests-count.yml deleted file mode 100644 index bfa38852a0..0000000000 --- a/.github/workflows/verify-gha-unit-tests-count.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: verify unit tests count - -on: - pull_request: - push: - branches: - - master - -jobs: - collect-and-verify: - runs-on: [ "ubuntu-20.04" ] - steps: - - uses: actions/checkout@v4 - - name: Setup Python - uses: actions/setup-python@v5 - with: - python-version: '3.11' - - - name: install system requirements - run: | - make ubuntu-requirements - - - name: install requirements - run: | - make test-requirements - - - name: verify unit tests count - uses: ./.github/actions/verify-tests-count