From 906e2c1ae4205a47585ad27c881ef5c5aa4a0836 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 5 Sep 2024 09:36:02 -0700 Subject: [PATCH 1/6] test combining coverage files --- .github/workflows/python-coverage-comment.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-coverage-comment.yaml b/.github/workflows/python-coverage-comment.yaml index e93d167..08847f4 100644 --- a/.github/workflows/python-coverage-comment.yaml +++ b/.github/workflows/python-coverage-comment.yaml @@ -20,12 +20,16 @@ jobs: pattern: coverage-* merge-multiple: true + - name: Merge coverage reports + run: | + ls -tlc + pipx run coverage combine coverage-* + - name: Coverage comment id: coverage_comment uses: py-cov-action/python-coverage-comment-action@v3 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - MERGE_COVERAGE_FILES: true - name: Store Pull Request comment to be posted uses: actions/upload-artifact@v4 From 994419104c945d9a93b54b1f2772267735e239fd Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 5 Sep 2024 09:44:18 -0700 Subject: [PATCH 2/6] debug --- .github/workflows/python-coverage-comment.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-coverage-comment.yaml b/.github/workflows/python-coverage-comment.yaml index 08847f4..19297d0 100644 --- a/.github/workflows/python-coverage-comment.yaml +++ b/.github/workflows/python-coverage-comment.yaml @@ -17,13 +17,14 @@ jobs: - uses: actions/download-artifact@v4 id: download with: + path: coverage-reports pattern: coverage-* merge-multiple: true - name: Merge coverage reports run: | - ls -tlc - pipx run coverage combine coverage-* + ls -tlc coverage-reports/ + pipx run coverage combine coverage-reports/ - name: Coverage comment id: coverage_comment From 1a679ed3c19994c42856af7826851dc984cb3c8b Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 5 Sep 2024 09:52:09 -0700 Subject: [PATCH 3/6] fix coverage path --- .github/workflows/python-coverage-comment.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/python-coverage-comment.yaml b/.github/workflows/python-coverage-comment.yaml index 19297d0..66cd76f 100644 --- a/.github/workflows/python-coverage-comment.yaml +++ b/.github/workflows/python-coverage-comment.yaml @@ -23,8 +23,7 @@ jobs: - name: Merge coverage reports run: | - ls -tlc coverage-reports/ - pipx run coverage combine coverage-reports/ + pipx run coverage combine coverage-reports/coverage.* - name: Coverage comment id: coverage_comment From 2e6ca31f915703cd45fba8a1f22541092e579900 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 5 Sep 2024 09:52:32 -0700 Subject: [PATCH 4/6] update naming --- .github/workflows/python-coverage-comment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-coverage-comment.yaml b/.github/workflows/python-coverage-comment.yaml index 66cd76f..51f0329 100644 --- a/.github/workflows/python-coverage-comment.yaml +++ b/.github/workflows/python-coverage-comment.yaml @@ -21,7 +21,7 @@ jobs: pattern: coverage-* merge-multiple: true - - name: Merge coverage reports + - name: Combine coverage reports run: | pipx run coverage combine coverage-reports/coverage.* From 5c7fef7f0d3a5d0a8239c6f9a472be401f064b48 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 5 Sep 2024 09:53:00 -0700 Subject: [PATCH 5/6] run prettier --- .../docker-push-containers-to-dockerhub-and-ecr.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-push-containers-to-dockerhub-and-ecr.yaml b/.github/workflows/docker-push-containers-to-dockerhub-and-ecr.yaml index cc35f0a..2d08b3a 100644 --- a/.github/workflows/docker-push-containers-to-dockerhub-and-ecr.yaml +++ b/.github/workflows/docker-push-containers-to-dockerhub-and-ecr.yaml @@ -39,8 +39,8 @@ on: required: true permissions: - id-token: write # This is required for requesting the JWT - contents: read # This is required for actions/checkout + id-token: write # This is required for requesting the JWT + contents: read # This is required for actions/checkout jobs: docker-push-containers-to-dockerhub-and-ecr: From 3eda57ef6703d844c368b2cd3d1f12e08d2438b8 Mon Sep 17 00:00:00 2001 From: Sam <109683132+kernelsam@users.noreply.github.com> Date: Thu, 5 Sep 2024 10:09:07 -0700 Subject: [PATCH 6/6] backwards compatibility --- .github/workflows/python-coverage-comment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-coverage-comment.yaml b/.github/workflows/python-coverage-comment.yaml index 51f0329..043b066 100644 --- a/.github/workflows/python-coverage-comment.yaml +++ b/.github/workflows/python-coverage-comment.yaml @@ -23,7 +23,7 @@ jobs: - name: Combine coverage reports run: | - pipx run coverage combine coverage-reports/coverage.* + pipx run coverage combine coverage-reports/*coverage.* - name: Coverage comment id: coverage_comment