From 96d3f3cc0b43aab157b944ce5bc448c2daab95a8 Mon Sep 17 00:00:00 2001 From: mrT23 Date: Tue, 6 Aug 2024 11:20:37 +0300 Subject: [PATCH 1/4] s --- .github/workflows/code_coverage.yaml | 50 ++++++++++++++++++++++++++++ requirements.txt | 1 + 2 files changed, 51 insertions(+) create mode 100644 .github/workflows/code_coverage.yaml diff --git a/.github/workflows/code_coverage.yaml b/.github/workflows/code_coverage.yaml new file mode 100644 index 00000000..6736255f --- /dev/null +++ b/.github/workflows/code_coverage.yaml @@ -0,0 +1,50 @@ +name: Code-coverage + +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + build-and-test: + runs-on: ubuntu-latest + + steps: + - id: checkout + uses: actions/checkout@v2 + + - id: dockerx + name: Setup Docker Buildx + uses: docker/setup-buildx-action@v2 + + - id: build + name: Build dev docker + uses: docker/build-push-action@v2 + with: + context: . + file: ./docker/Dockerfile + push: false + load: true + tags: codiumai/pr-agent:test + cache-from: type=gha,scope=dev + cache-to: type=gha,mode=max,scope=dev + target: test + + - id: code_cov + name: Test dev docker + run: | + docker run --rm codiumai/pr-agent:test pytest tests/unittest --cov=pr_agent + + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v4.0.1 + with: + files: ./coverage.xml + token: ${{ secrets.CODECOV_TOKEN }} + flags: unittests + name: code-coverage + fail_ci_if_error: true + + diff --git a/requirements.txt b/requirements.txt index a8d27cc0..d634e4b9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,6 +25,7 @@ ujson==5.8.0 uvicorn==0.22.0 tenacity==8.2.3 gunicorn==22.0.0 +pytest-cov==5.0.0 # Uncomment the following lines to enable the 'similar issue' tool # pinecone-client # pinecone-datasets @ git+https://github.com/mrT23/pinecone-datasets.git@main From e717e8ae816aaa69db18e3402fb661f118ede09a Mon Sep 17 00:00:00 2001 From: mrT23 Date: Tue, 6 Aug 2024 19:38:59 +0300 Subject: [PATCH 2/4] Update code_coverage.yaml to improve Docker test execution and Codecov upload --- .github/workflows/code_coverage.yaml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/code_coverage.yaml b/.github/workflows/code_coverage.yaml index 6736255f..9d7d9012 100644 --- a/.github/workflows/code_coverage.yaml +++ b/.github/workflows/code_coverage.yaml @@ -1,9 +1,10 @@ name: Code-coverage on: - push: - branches: - - main + workflow_dispatch: + # push: + # branches: + # - main pull_request: branches: - main @@ -36,15 +37,11 @@ jobs: - id: code_cov name: Test dev docker run: | - docker run --rm codiumai/pr-agent:test pytest tests/unittest --cov=pr_agent + docker run --name test_container codiumai/pr-agent:test pytest tests/unittest --cov=pr_agent --cov-report term --cov-report xml:coverage.xml + docker cp test_container:/app/coverage.xml coverage.xml + - name: Upload coverage to Codecov uses: codecov/codecov-action@v4.0.1 with: - files: ./coverage.xml - token: ${{ secrets.CODECOV_TOKEN }} - flags: unittests - name: code-coverage - fail_ci_if_error: true - - + token: ${{ secrets.CODECOV_TOKEN }} \ No newline at end of file From c07059e139b4c8555bc9ab5ee26bf624d483f2dc Mon Sep 17 00:00:00 2001 From: Tal Date: Tue, 6 Aug 2024 19:45:14 +0300 Subject: [PATCH 3/4] Update .github/workflows/code_coverage.yaml Co-authored-by: codiumai-pr-agent-pro[bot] <151058649+codiumai-pr-agent-pro[bot]@users.noreply.github.com> --- .github/workflows/code_coverage.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/code_coverage.yaml b/.github/workflows/code_coverage.yaml index 9d7d9012..f55f083e 100644 --- a/.github/workflows/code_coverage.yaml +++ b/.github/workflows/code_coverage.yaml @@ -41,6 +41,12 @@ jobs: docker cp test_container:/app/coverage.xml coverage.xml + - name: Validate coverage report + run: | + if [ ! -f coverage.xml ]; then + echo "Coverage report not found" + exit 1 + fi - name: Upload coverage to Codecov uses: codecov/codecov-action@v4.0.1 with: From 620dbbeb1ab9c6ae8d7d02c4286fd52e5fc798d6 Mon Sep 17 00:00:00 2001 From: Tal Date: Tue, 6 Aug 2024 19:45:35 +0300 Subject: [PATCH 4/4] Update .github/workflows/code_coverage.yaml Co-authored-by: codiumai-pr-agent-pro[bot] <151058649+codiumai-pr-agent-pro[bot]@users.noreply.github.com> --- .github/workflows/code_coverage.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/code_coverage.yaml b/.github/workflows/code_coverage.yaml index f55f083e..136ed9a7 100644 --- a/.github/workflows/code_coverage.yaml +++ b/.github/workflows/code_coverage.yaml @@ -39,6 +39,7 @@ jobs: run: | docker run --name test_container codiumai/pr-agent:test pytest tests/unittest --cov=pr_agent --cov-report term --cov-report xml:coverage.xml docker cp test_container:/app/coverage.xml coverage.xml + docker rm test_container - name: Validate coverage report