From 2c7fb4b508c3192085e8f53cce3b7c5de8813b99 Mon Sep 17 00:00:00 2001 From: Sebastian Baunsgaard Date: Sat, 28 Sep 2024 22:44:11 +0200 Subject: [PATCH] [SYSTEMDS-3775] Revert components This commit reverts the recent addition of components in the code coverage utility. Unfortunately, the components did more than anticipated, because they add more checks to the commits and were not visible in the PR that was trying their behavior. The intended behavior was to have coverage measurements and easy selection of sub-packages in the codecov webpage (this worked on the PR). Instead, it also added extra unintended 'Actions' that had to be passed for validation once merged to main. Furthermore, the Python upload of code coverage did not work once merged to main, therefore that change is reverted as well. --- .github/workflows/python.yml | 12 +++--------- codecov.yml | 36 ------------------------------------ 2 files changed, 3 insertions(+), 45 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index a53aa406bd1..e5d8f1539da 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -128,7 +128,7 @@ jobs: export SYSDS_QUIET=1 export LOG4JPROP=$SYSTEMDS_ROOT/src/test/resources/log4j.properties cd src/main/python - unittest-parallel -t . -s tests -v --coverage-branch --coverage-xml .coverage.xml --coverage-source systemds + unittest-parallel -t . -s tests -v # python -m unittest discover -s tests -p 'test_*.py' echo "Exit Status: " $? @@ -136,7 +136,7 @@ jobs: run: | export LOG4JPROP=$(pwd)/src/test/resources/log4j.properties cd src/main/python - unittest-parallel -t . -s tests -v --coverage-branch --coverage-xml .coverage.xml --coverage-source systemds + unittest-parallel -t . -s tests -v # python -m unittest discover -s tests -p 'test_*.py' echo "Exit Status: " $? @@ -155,10 +155,4 @@ jobs: run: | black --check src/main/python/tests - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4.2.0 - if: github.repository_owner == 'apache' - env: - fail_ci_if_error: false - files: src/main/python/.coverage.xml - token: ${{ secrets.CODECOV_TOKEN }} + diff --git a/codecov.yml b/codecov.yml index 4a1ae08261c..e74934e47af 100644 --- a/codecov.yml +++ b/codecov.yml @@ -34,39 +34,3 @@ coverage: range: "50...75" ignore: - "src/main/java/org/apache/sysds/protobuf" -component_management: - default_rules: # default rules that will be inherited by all components - statuses: - - type: project # in this case every component that doesn't have a status defined will have a project type one - target: auto - individual_components: - - component_id: module_runtime # this is an identifier that should not be changed - name: runtime # this is a display name, and can be changed freely - paths: - - src/main/java/org/apache/sysds/runtime/** - - component_id: module_matrix # this is an identifier that should not be changed - name: matrix # this is a display name, and can be changed freely - paths: - - src/main/java/org/apache/sysds/runtime/matrix/** - - component_id: module_frame # this is an identifier that should not be changed - name: frame # this is a display name, and can be changed freely - paths: - - src/main/java/org/apache/sysds/runtime/frame/** - - component_id: module_compress # this is an identifier that should not be changed - name: compress # this is a display name, and can be changed freely - paths: - - src/main/java/org/apache/sysds/runtime/compress/** - - component_id: module_compiler # this is an identifier that should not be changed - name: compiler # this is a display name, and can be changed freely - paths: - - src/main/java/org/apache/sysds/hops/** - - src/main/java/org/apache/sysds/lops/** - - src/main/java/org/apache/sysds/parser/** - - component_id: module_util # this is an identifier that should not be changed - name: util # this is a display name, and can be changed freely - paths: - - src/main/java/org/apache/sysds/api/** - - src/main/java/org/apache/sysds/common/** - - src/main/java/org/apache/sysds/conf/** - - src/main/java/org/apache/sysds/resource/** - - src/main/java/org/apache/sysds/utils/**