Skip to content

Commit 0169a19

Browse files
authored
Merge branch 'main' into feat/ci
2 parents 0a6a409 + 8a35352 commit 0169a19

File tree

3 files changed

+1
-11
lines changed

3 files changed

+1
-11
lines changed

.github/workflows/test.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,23 +83,13 @@ jobs:
8383
env:
8484
COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.pydantic-version }}
8585
CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}
86-
# TODO: if removing Smokeshow, and moving only to Codecov, remove this
87-
# Upload files before running Codecov, as it generates an extra file coverage/coverage.xml, and that breaks coverage-combine
8886
- name: Store coverage files
8987
uses: actions/upload-artifact@v4
9088
with:
9189
name: coverage-${{ matrix.os }}-${{ matrix.python-version }}-${{ matrix.pydantic-version }}
9290
path: coverage
9391
include-hidden-files: true
94-
- uses: codecov/codecov-action@v5
95-
with:
96-
fail_ci_if_error: true
97-
files: ./coverage.xml
98-
name: codecov-umbrella
99-
token: ${{ secrets.CODECOV_TOKEN }}
100-
verbose: true
10192

102-
# TODO: if removing Smokeshow, and moving only to Codecov, remove this
10393
coverage-combine:
10494
needs:
10595
- test

docs/release-notes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
### Internal
2424

25+
* 👷 Revert "Add Codecov to CI, Smokeshow/Cloudflare has been flaky lately (#1303)". PR [#1306](https://github.com/fastapi/sqlmodel/pull/1306) by [@svlandeg](https://github.com/svlandeg).
2526
* 👷 Add Codecov to CI, Smokeshow/Cloudflare has been flaky lately. PR [#1303](https://github.com/fastapi/sqlmodel/pull/1303) by [@tiangolo](https://github.com/tiangolo).
2627
* 👷 Add retries to Smokeshow. PR [#1302](https://github.com/fastapi/sqlmodel/pull/1302) by [@svlandeg](https://github.com/svlandeg).
2728
* ⬆ Bump astral-sh/setup-uv from 4 to 5. PR [#1249](https://github.com/fastapi/sqlmodel/pull/1249) by [@dependabot[bot]](https://github.com/apps/dependabot).

scripts/test.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ coverage run -m pytest tests
77
coverage combine
88
coverage report
99
coverage html
10-
coverage xml

0 commit comments

Comments
 (0)