From 936c073d232bd21e5389e9f46af98e22ce9b1f7f Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Sat, 13 Aug 2022 20:06:14 +0530 Subject: [PATCH] Revert "ci: Only upload server-side coverage report if .py files are changed" partially reverts this PR https://github.com/frappe/frappe/pull/16048 This is causing random fluctations. --- .github/helper/roulette.py | 1 - .github/workflows/ui-tests.yml | 11 +++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/helper/roulette.py b/.github/helper/roulette.py index 554f4ae5f5..13f843eb3e 100644 --- a/.github/helper/roulette.py +++ b/.github/helper/roulette.py @@ -62,7 +62,6 @@ if __name__ == "__main__": # this is a push build, run all builds if not pr_number: os.system('echo "::set-output name=build::strawberry"') - os.system('echo "::set-output name=build-server::strawberry"') sys.exit(0) files_list = files_list or get_files_list(pr_number=pr_number, repo=repo) diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index 877ad67f6c..2db81bd2cc 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -149,20 +149,15 @@ jobs: env: CYPRESS_RECORD_KEY: 4a48f41c-11b3-425b-aa88-c58048fa69eb + # Required to flush python coverage files - name: Stop server - if: ${{ steps.check-build.outputs.build-server == 'strawberry' }} + if: ${{ steps.check-build.outputs.build == 'strawberry' }} run: | ps -ef | grep "frappe serve" | awk '{print $2}' | xargs kill -s SIGINT 2> /dev/null || true sleep 5 - - name: Check If Coverage Report Exists - id: check_coverage - uses: andstor/file-existence-action@v1 - with: - files: "/home/runner/frappe-bench/apps/frappe/.cypress-coverage/clover.xml" - - name: Upload JS coverage data - if: ${{ steps.check-build.outputs.build == 'strawberry' && steps.check_coverage.outputs.files_exists == 'true' }} + if: ${{ steps.check-build.outputs.build == 'strawberry' }} uses: actions/upload-artifact@v3 with: name: coverage-js-${{ matrix.container }}