Skip to content

Commit 2c45446

Browse files
committed
Merge branch 'main' into feat/ci
2 parents caeb94a + b8ded9b commit 2c45446

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

.github/workflows/test.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,23 @@ jobs:
7575
env:
7676
COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}-${{ matrix.pydantic-version }}
7777
CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}
78+
# TODO: if removing Smokeshow, and moving only to Codecov, remove this
79+
# Upload files before running Codecov, as it generates an extra file coverage/coverage.xml, and that breaks coverage-combine
7880
- name: Store coverage files
7981
uses: actions/upload-artifact@v4
8082
with:
8183
name: coverage-${{ matrix.python-version }}-${{ matrix.pydantic-version }}
8284
path: coverage
8385
include-hidden-files: true
86+
- uses: codecov/codecov-action@v5
87+
with:
88+
fail_ci_if_error: true
89+
files: ./coverage.xml
90+
name: codecov-umbrella
91+
token: ${{ secrets.CODECOV_TOKEN }}
92+
verbose: true
8493

94+
# TODO: if removing Smokeshow, and moving only to Codecov, remove this
8595
coverage-combine:
8696
needs:
8797
- 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+
* 👷 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).
2526
* 👷 Add retries to Smokeshow. PR [#1302](https://github.com/fastapi/sqlmodel/pull/1302) by [@svlandeg](https://github.com/svlandeg).
2627
* ⬆ 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).
2728
* ⬆ Bump pillow from 10.3.0 to 11.0.0. PR [#1139](https://github.com/fastapi/sqlmodel/pull/1139) by [@dependabot[bot]](https://github.com/apps/dependabot).

scripts/test.sh

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

0 commit comments

Comments
 (0)